diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 7c22b8fd3..ad37c1bee 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -678,7 +678,7 @@ $rcmail_config['addressbook_search_mode'] = 0;
$rcmail_config['default_charset'] = 'ISO-8859-1';
// skin name: folder from skins/
-$rcmail_config['skin'] = 'default';
+$rcmail_config['skin'] = 'larry';
// show up to X items in messages list view
$rcmail_config['mail_pagesize'] = 50;
diff --git a/plugins/acl/package.xml b/plugins/acl/package.xml
index 9ef91d16d..e5d411e18 100644
--- a/plugins/acl/package.xml
+++ b/plugins/acl/package.xml
@@ -38,10 +38,10 @@
-
-
-
-
+
+
+
+
diff --git a/plugins/archive/package.xml b/plugins/archive/package.xml
index 0d02b2d41..1aeffaf41 100644
--- a/plugins/archive/package.xml
+++ b/plugins/archive/package.xml
@@ -50,9 +50,9 @@
-
-
-
+
+
+
diff --git a/plugins/help/package.xml b/plugins/help/package.xml
index 67e83fb06..2c4fd2cc8 100644
--- a/plugins/help/package.xml
+++ b/plugins/help/package.xml
@@ -33,9 +33,9 @@
-
-
-
+
+
+
diff --git a/plugins/hide_blockquote/package.xml b/plugins/hide_blockquote/package.xml
index 833691261..0d895c1d9 100644
--- a/plugins/hide_blockquote/package.xml
+++ b/plugins/hide_blockquote/package.xml
@@ -36,7 +36,7 @@
-
+
diff --git a/plugins/jqueryui/config.inc.php.dist b/plugins/jqueryui/config.inc.php.dist
index 65c01757a..a3c3f75a0 100644
--- a/plugins/jqueryui/config.inc.php.dist
+++ b/plugins/jqueryui/config.inc.php.dist
@@ -6,6 +6,7 @@ $rcmail_config['jquery_ui_i18n'] = array('datepicker');
// map Roundcube skins with jquery-ui themes here
$rcmail_config['jquery_ui_skin_map'] = array(
'larry' => 'larry',
+ 'default' => 'larry',
'groupvice4' => 'redmond',
);
diff --git a/plugins/jqueryui/jqueryui.php b/plugins/jqueryui/jqueryui.php
index 69b9ca1c0..f82a149b8 100644
--- a/plugins/jqueryui/jqueryui.php
+++ b/plugins/jqueryui/jqueryui.php
@@ -24,7 +24,7 @@ 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');
$ui_map = $rcmail->config->get('jquery_ui_skin_map', array());
$ui_theme = $ui_map[$skin] ? $ui_map[$skin] : $skin;
@@ -32,7 +32,7 @@ class jqueryui extends rcube_plugin
$this->include_stylesheet("themes/$ui_theme/jquery-ui-$version.custom.css");
}
else {
- $this->include_stylesheet("themes/default/jquery-ui-$version.custom.css");
+ $this->include_stylesheet("themes/larry/jquery-ui-$version.custom.css");
}
// jquery UI localization
diff --git a/plugins/jqueryui/package.xml b/plugins/jqueryui/package.xml
index 18f241a2e..1d265169c 100644
--- a/plugins/jqueryui/package.xml
+++ b/plugins/jqueryui/package.xml
@@ -99,22 +99,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/managesieve/package.xml b/plugins/managesieve/package.xml
index 1c60a7cc9..cde78c9a3 100644
--- a/plugins/managesieve/package.xml
+++ b/plugins/managesieve/package.xml
@@ -85,16 +85,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/plugins/markasjunk/package.xml b/plugins/markasjunk/package.xml
index 95690eb9b..a5b4bf92c 100644
--- a/plugins/markasjunk/package.xml
+++ b/plugins/markasjunk/package.xml
@@ -50,8 +50,8 @@
-
-
+
+
diff --git a/plugins/vcard_attachments/package.xml b/plugins/vcard_attachments/package.xml
index cf94ef378..82b750ad5 100644
--- a/plugins/vcard_attachments/package.xml
+++ b/plugins/vcard_attachments/package.xml
@@ -61,9 +61,9 @@
-
-
-
+
+
+
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 9db746fe8..a0e914b78 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -81,10 +81,14 @@ class rcube_config
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
}
else {
- $this->prop['skin'] = 'default';
+ $this->prop['skin'] = 'larry';
}
}
+ // larry is the new default skin :-)
+ if ($this->prop['skin'] == 'default')
+ $this->prop['skin'] = 'larry';
+
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
$this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';
@@ -238,10 +242,8 @@ class rcube_config
// Honor the dont_override setting for any existing user preferences
$dont_override = $this->get('dont_override');
if (is_array($dont_override) && !empty($dont_override)) {
- foreach ($prefs as $key => $pref) {
- if (in_array($key, $dont_override)) {
- unset($prefs[$key]);
- }
+ foreach ($dont_override as $key) {
+ unset($prefs[$key]);
}
}
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b91355c98..b1ec32a8a 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,9 +336,12 @@ abstract class rcube_plugin
public function local_skin_path()
{
$rcmail = rcube::get_instance();
- $skin_path = 'skins/' . $rcmail->config->get('skin');
- if (!is_dir(realpath(slashify($this->home) . $skin_path)))
- $skin_path = 'skins/default';
+ foreach (array($rcmail->config->get('skin'),'default') as $skin) {
+ $skin_path = 'skins/' . $skin;
+ if (is_dir(realpath(slashify($this->home) . $skin_path)))
+ break;
+ }
+
return $skin_path;
}