Permalink
Browse files

Replace some forgotten references to skins/default (#1488591)

  • Loading branch information...
1 parent 23557f0 commit aff970b5d3c71d3422852e49dbfcdbf5c8e8bbe0 @thomascube thomascube committed Aug 9, 2012
Showing with 9 additions and 6 deletions.
  1. +1 −1 .htaccess
  2. +1 −0 CHANGELOG
  3. +5 −3 program/include/rcube_config.php
  4. +1 −1 program/include/rcube_output_html.php
  5. +1 −1 skins/classic/ie6hacks.css
View
@@ -28,7 +28,7 @@ php_value mbstring.func_overload 0
<IfModule mod_rewrite.c>
RewriteEngine On
-RewriteRule ^favicon\.ico$ skins/default/images/favicon.ico
+RewriteRule ^favicon\.ico$ skins/larry/images/favicon.ico
# security rules
RewriteRule .git - [F]
RewriteRule ^/?(README(.md)?|INSTALL|LICENSE|SQL|bin|CHANGELOG)$ - [F]
View
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix fallback to Larry skin when configured skin isn't available (#1488591)
- Fix (workaround) delete operations with some versions of memcache (#1488592)
- Fix (disable) request validation for spell and spell_html actions
- Add new DB abstraction layer based on PHP PDO, supporting SQLite3 (#1488332)
@@ -26,6 +26,8 @@
*/
class rcube_config
{
+ const DEFAULT_SKIN = 'larry';
+
private $prop = array();
private $errors = array();
private $userprefs = array();
@@ -81,13 +83,13 @@ private function load()
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
}
else {
- $this->prop['skin'] = 'larry';
+ $this->prop['skin'] = self::DEFAULT_SKIN;
}
}
// larry is the new default skin :-)
if ($this->prop['skin'] == 'default')
- $this->prop['skin'] = 'larry';
+ $this->prop['skin'] = self::DEFAULT_SKIN;
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
@@ -254,7 +256,7 @@ public function set_user_prefs($prefs)
// larry is the new default skin :-)
if ($prefs['skin'] == 'default') {
- $prefs['skin'] = 'larry';
+ $prefs['skin'] = self::DEFAULT_SKIN;
}
$this->userprefs = $prefs;
@@ -149,7 +149,7 @@ public function set_skin($skin)
else {
$skin_path = $this->config->get('skin_path');
if (!$skin_path) {
- $skin_path = 'skins/default';
+ $skin_path = 'skins/' . rcube_config::DEFAULT_SKIN;
}
$valid = !$skin;
}
@@ -7,7 +7,7 @@
img
{
- behavior: url(skins/default/pngbehavior.htc);
+ behavior: url(skins/classic/pngbehavior.htc);
}
#logo

0 comments on commit aff970b

Please sign in to comment.