Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#57519: Custom favicon did not use base_path()

4.7.x
Steven Wittens 2006-04-06 02:35:57 +00:00
parent 35c4ad2bc2
commit b3c245c08c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
includes/theme.inc
View File

@ -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'];
}
}
}