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

2 files changed, 6 insertions, 4 deletions

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index aae3656a1..2fe0d9745 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -26,6 +26,8 @@
  */
 class rcube_config
 {
+    const DEFAULT_SKIN = 'larry';
+
     private $prop = array();
     private $errors = array();
     private $userprefs = array();
@@ -81,13 +83,13 @@ class rcube_config
                 $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 @@ class rcube_config
 
         // larry is the new default skin :-)
         if ($prefs['skin'] == 'default') {
-            $prefs['skin'] = 'larry';
+            $prefs['skin'] = self::DEFAULT_SKIN;
         }
 
         $this->userprefs = $prefs;
diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php
index 3bc93db53..30512d227 100644
--- a/program/include/rcube_output_html.php
+++ b/program/include/rcube_output_html.php
@@ -149,7 +149,7 @@ class rcube_output_html extends rcube_output
         else {
             $skin_path = $this->config->get('skin_path');
             if (!$skin_path) {
-                $skin_path = 'skins/default';
+                $skin_path = 'skins/' . rcube_config::DEFAULT_SKIN;
             }
             $valid = !$skin;
         }