- Fix selecting jqueryui theme when the plugin isn't configured

git-svn-id: https://svn.roundcube.net/trunk@5676 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 7ed201873..22eb726ab 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,9 +24,9 @@ class jqueryui extends rcube_plugin
     $this->include_script("js/jquery-ui-$version.custom.min.js");
 
     // include UI stylesheet
-    $skin = $rcmail->config->get('skin', 'default');
+    $skin   = $rcmail->config->get('skin', 'default');
     $ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
-    $ui_theme = $ui_map[$skin] ? $ui_map[$skin] : 'default';
+    $ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;
 
     if (file_exists($this->home . "/themes/$ui_theme/jquery-ui-$version.custom.css")) {
       $this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
@@ -36,7 +36,7 @@ class jqueryui extends rcube_plugin
     }
 
     // jquery UI localization
-    $jquery_ui_i18n = $rcmail->config->get('jquery_ui_i18n', array());
+    $jquery_ui_i18n = $rcmail->config->get('jquery_ui_i18n', array('datepicker'));
     if (count($jquery_ui_i18n) > 0) {
       $lang_l = str_replace('_', '-', substr($_SESSION['language'], 0, 5));
       $lang_s = substr($_SESSION['language'], 0, 2);