From b3c245c08c121ec6915d58b3709d0fa9e3469f56 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Thu, 6 Apr 2006 02:35:57 +0000
Subject: #57519: Custom favicon did not use base_path()

---
 includes/theme.inc | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'includes')

diff --git a/includes/theme.inc b/includes/theme.inc
index cd645ade2..b4752221c 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -307,17 +307,16 @@ function theme_get_setting($setting_name, $refresh = FALSE) {
     }
 
     if ($settings['toggle_favicon']) {
-      $settings['favicon'] = base_path();
       if ($settings['default_favicon']) {
         if (file_exists($favicon = dirname($theme_object->filename) .'/favicon.ico')) {
-          $settings['favicon'] .= $favicon;
+          $settings['favicon'] = base_path() . $favicon;
         }
         else {
-          $settings['favicon'] .= 'misc/favicon.ico';
+          $settings['favicon'] = base_path() . 'misc/favicon.ico';
         }
       }
       elseif ($settings['favicon_path']) {
-        $settings['favicon'] .= $settings['favicon_path'];
+        $settings['favicon'] = base_path() . $settings['favicon_path'];
       }
     }
   }
-- 
cgit v1.2.3