Fix so Elastic is also a default in jqueryui plugin (#7039)

pull/5989/merge
Aleksander Machniak 5 years ago
parent 40aef395bb
commit 90738d7a36

@ -11,6 +11,7 @@ CHANGELOG Roundcube Webmail
- Fix db_prefix handling in queries with `TRUNCATE TABLE <name>` and `UNIQUE <name>` (#7013) - Fix db_prefix handling in queries with `TRUNCATE TABLE <name>` and `UNIQUE <name>` (#7013)
- Fix so update.sh script warns about changed defaults (#7011) - Fix so update.sh script warns about changed defaults (#7011)
- Fix tables listing routine when DSN contained a database with unsupported suffix (#7034) - Fix tables listing routine when DSN contained a database with unsupported suffix (#7034)
- Fix so Elastic is also a default in jqueryui plugin (#7039)
RELEASE 1.4.0 RELEASE 1.4.0
------------- -------------

@ -6,7 +6,7 @@ $config['jquery_ui_i18n'] = array('datepicker');
// map Roundcube skins with jquery-ui themes here // map Roundcube skins with jquery-ui themes here
$config['jquery_ui_skin_map'] = array( $config['jquery_ui_skin_map'] = array(
'larry' => 'larry', 'larry' => 'larry',
'default' => 'larry', 'default' => 'elastic',
); );
?> ?>

@ -18,6 +18,10 @@ class jqueryui extends rcube_plugin
private static $features = array(); private static $features = array();
private static $ui_theme; private static $ui_theme;
private static $skin_map = array(
'larry' => 'larry',
'default' => 'elastic',
);
public function init() public function init()
{ {
@ -35,9 +39,9 @@ class jqueryui extends rcube_plugin
// include UI stylesheet // include UI stylesheet
$skin = $rcmail->config->get('skin'); $skin = $rcmail->config->get('skin');
$ui_map = $rcmail->config->get('jquery_ui_skin_map', array()); $ui_map = $rcmail->config->get('jquery_ui_skin_map', self::$skin_map);
$skins = array_keys($rcmail->output->skins); $skins = array_keys($rcmail->output->skins);
$skins[] = 'larry'; $skins[] = 'elastic';
foreach ($skins as $skin) { foreach ($skins as $skin) {
self::$ui_theme = $ui_theme = $ui_map[$skin] ?: $skin; self::$ui_theme = $ui_theme = $ui_map[$skin] ?: $skin;

@ -63,7 +63,7 @@ class rcmail_install
/** @var array List of config options with default value change per-release */ /** @var array List of config options with default value change per-release */
public $defaults_changes = array( public $defaults_changes = array(
'1.4.0' => array('skin', 'smtp_port', 'smtp_user', 'smtp_pass'), '1.4.0' => array('skin', 'smtp_port', 'smtp_user', 'smtp_pass', 'jquery_ui_skin_map'),
); );
/** /**

Loading…
Cancel
Save