summaryrefslogtreecommitdiff
path: root/includes/theme.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/theme.inc')
-rw-r--r--includes/theme.inc7
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'];
}
}
}