From 4ffb77baae95c35d4bf5936b86b856da19101bde Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 30 Jan 2006 21:32:09 +0000 Subject: - Patch #13148 by Morbus: further base path fixes / clean-ups. --- includes/theme.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'includes') diff --git a/includes/theme.inc b/includes/theme.inc index 1894d2a16..29da91fe3 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -308,19 +308,19 @@ 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'] .= $favicon; } else { - $settings['favicon'] = 'misc/favicon.ico'; + $settings['favicon'] .= 'misc/favicon.ico'; } } elseif ($settings['favicon_path']) { - $settings['favicon'] = $settings['favicon_path']; + $settings['favicon'] .= $settings['favicon_path']; } } - } return isset($settings[$setting_name]) ? $settings[$setting_name] : NULL; @@ -427,9 +427,10 @@ function theme_page($content) { } function theme_maintenance_page($content) { + global $base_path; drupal_set_header('Content-Type: text/html; charset=utf-8'); theme('add_style', 'misc/maintenance.css'); - drupal_set_html_head(''); + drupal_set_html_head(''); $output = "\n"; $output .= ''; $output .= ''; @@ -634,7 +635,6 @@ function theme_form_element($title, $value, $description = NULL, $id = NULL, $re return $output; } - /** * Return a themed submenu, typically displayed under the tabs. * -- cgit v1.2.3