summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorSteven Wittens <steven@10.no-reply.drupal.org>2006-04-04 23:31:04 +0000
committerSteven Wittens <steven@10.no-reply.drupal.org>2006-04-04 23:31:04 +0000
commit6ab6b8abcd60f2de76e17d772805cbfb12420cc9 (patch)
tree7c9ec0b251b8250e93d16b8bac701734e9edfbd0 /includes
parente1c749fac4d521d845658fa1f63603737c22a8fc (diff)
downloadbrdo-6ab6b8abcd60f2de76e17d772805cbfb12420cc9.tar.gz
brdo-6ab6b8abcd60f2de76e17d772805cbfb12420cc9.tar.bz2
#57333: Only set logo image path if it exists
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc5
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index ec085d946..cd645ade2 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -298,12 +298,11 @@ function theme_get_setting($setting_name, $refresh = FALSE) {
}
if ($settings['toggle_logo']) {
- $settings['logo'] = base_path();
if ($settings['default_logo']) {
- $settings['logo'] .= dirname($theme_object->filename) .'/logo.png';
+ $settings['logo'] = base_path() . dirname($theme_object->filename) .'/logo.png';
}
elseif ($settings['logo_path']) {
- $settings['logo'] .= $settings['logo_path'];
+ $settings['logo'] = base_path() . $settings['logo_path'];
}
}