Commit b3c245c0 authored by Steven Wittens's avatar Steven Wittens
Browse files

#57519: Custom favicon did not use base_path()

parent 35c4ad2b
......@@ -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'];
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment