From 6ab6b8abcd60f2de76e17d772805cbfb12420cc9 Mon Sep 17 00:00:00 2001
From: Steven Wittens <steven@10.no-reply.drupal.org>
Date: Tue, 4 Apr 2006 23:31:04 +0000
Subject: [PATCH] #57333: Only set logo image path if it exists
---
includes/theme.inc | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/includes/theme.inc b/includes/theme.inc
index ec085d946b6c..cd645ade2919 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'];
}
}
--
GitLab