.htaccess | ●●●●● patch | view | raw | blame | history | |
CHANGELOG | ●●●●● patch | view | raw | blame | history | |
program/include/rcube_config.php | ●●●●● patch | view | raw | blame | history | |
program/include/rcube_template.php | ●●●●● patch | view | raw | blame | history | |
skins/classic/ie6hacks.css | ●●●●● patch | view | raw | blame | history |
.htaccess
@@ -28,7 +28,7 @@ <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] CHANGELOG
@@ -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 program/include/rcube_config.php
@@ -29,6 +29,8 @@ */ class rcube_config { const DEFAULT_SKIN = 'larry'; private $prop = array(); private $errors = array(); private $userprefs = array(); @@ -74,14 +76,15 @@ $this->load_host_config(); // set skin (with fallback to old 'skin_path' property) if (empty($this->prop['skin']) && !empty($this->prop['skin_path'])) $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path'])); else if (empty($this->prop['skin'])) $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'; @@ -251,8 +254,9 @@ } // larry is the new default skin :-) if ($prefs['skin'] == 'default') $prefs['skin'] = 'larry'; $prefs['skin'] = self::DEFAULT_SKIN; $this->userprefs = $prefs; $this->prop = array_merge($this->prop, $prefs); program/include/rcube_template.php
@@ -158,7 +158,7 @@ $valid = true; } else { $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default'; $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : rcube_config::DEFAULT_SKIN; $valid = !$skin; } skins/classic/ie6hacks.css
@@ -7,7 +7,7 @@ img { behavior: url(skins/default/pngbehavior.htc); behavior: url(skins/classic/pngbehavior.htc); } #logo