diff options
| author | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-06 02:35:57 +0000 |
|---|---|---|
| committer | Steven Wittens <steven@10.no-reply.drupal.org> | 2006-04-06 02:35:57 +0000 |
| commit | b3c245c08c121ec6915d58b3709d0fa9e3469f56 (patch) | |
| tree | b9d0f584914fecd6cf8ecfdba6948c0b17ee2dac /includes | |
| parent | 35c4ad2bc2cac9e34ca7ffb9ce8296a386df5a49 (diff) | |
| download | brdo-b3c245c08c121ec6915d58b3709d0fa9e3469f56.tar.gz brdo-b3c245c08c121ec6915d58b3709d0fa9e3469f56.tar.bz2 | |
#57519: Custom favicon did not use base_path()
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/theme.inc | 7 |
1 files changed, 3 insertions, 4 deletions
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']; } } } |