Changeset 2716:b4abeeea33f2 for themes

Timestamp:

05/31/14 08:52:29 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Use default Ductile logo if themes prefs not yet saved

File:

• themes/ductile/_public.php (modified) (1 diff)

themes/ductile/_public.php

@@ -164 +164 @@
      public static function ductileLogoSrcHelper()
      {
+          $img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/logo.png';
+
           $s = $GLOBALS['core']->blog->settings->themes->get($GLOBALS['core']->blog->settings->system->theme.'_style');
           if ($s === null) {
-               return;
+               // no settings yet, return default logo
+               return $img_url;
           }
           $s = @unserialize($s);
           if (!is_array($s)) {
-               return;
-          }
-
-          $img_url = $GLOBALS['core']->blog->settings->system->themes_url.'/'.$GLOBALS['core']->blog->settings->system->theme.'/img/logo.png';
+               // settings error, return default logo
+               return $img_url;
+          }
+
           if (isset($s['logo_src'])) {
                if ($s['logo_src'] !== null) {