Template: Favicon fix.
This commit is contained in:
parent
889e370a10
commit
1f145a08c7
|
|
@ -101,6 +101,26 @@
|
||||||
if (is_array($_SESSION['theme']) && @sizeof($_SESSION['theme']) != 0) {
|
if (is_array($_SESSION['theme']) && @sizeof($_SESSION['theme']) != 0) {
|
||||||
//load into array
|
//load into array
|
||||||
foreach ($_SESSION['theme'] as $subcategory => $setting) {
|
foreach ($_SESSION['theme'] as $subcategory => $setting) {
|
||||||
|
switch($subcategory) {
|
||||||
|
//exceptions
|
||||||
|
case 'favicon':
|
||||||
|
if ($setting['text'] != '') {
|
||||||
|
$tmp_url = parse_url($setting['text']);
|
||||||
|
$tmp_path = pathinfo($setting['text']);
|
||||||
|
if (
|
||||||
|
is_array($tmp_url) && @sizeof($tmp_url) != 0 &&
|
||||||
|
is_array($tmp_path) && @sizeof($tmp_path) != 0 &&
|
||||||
|
(
|
||||||
|
($tmp_url['scheme'] != '' && $tmp_url['scheme'].'://'.$tmp_url['host'].$tmp_url['path'] == $tmp_path['dirname'].'/'.$tmp_path['filename'].'.'.$tmp_path['extension']) //is url
|
||||||
|
|| $tmp_url['path'] == $tmp_path['dirname'].'/'.$tmp_path['filename'].'.'.$tmp_path['extension'] //is path
|
||||||
|
)) {
|
||||||
|
$settings['theme'][$subcategory] = $setting['text'];
|
||||||
|
}
|
||||||
|
unset($tmp_url, $tmp_path);
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
//otherwise
|
||||||
|
default:
|
||||||
if (isset($setting['text']) && $setting['text'] != '') {
|
if (isset($setting['text']) && $setting['text'] != '') {
|
||||||
$settings['theme'][$subcategory] = escape($setting['text']);
|
$settings['theme'][$subcategory] = escape($setting['text']);
|
||||||
}
|
}
|
||||||
|
|
@ -111,8 +131,9 @@
|
||||||
$settings['theme'][$subcategory] = escape($setting);
|
$settings['theme'][$subcategory] = escape($setting);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
//pre-process some settings
|
//pre-process some settings
|
||||||
$settings['theme']['favicon'] = $settings['theme']['favicon'] != '' ? urlencode($settings['theme']['favicon']) : PROJECT_PATH.'/themes/default/favicon.ico';
|
$settings['theme']['favicon'] = $settings['theme']['favicon'] != '' ? $settings['theme']['favicon'] : PROJECT_PATH.'/themes/default/favicon.ico';
|
||||||
$settings['theme']['font_loader_version'] = $settings['theme']['font_loader_version'] != '' ? urlencode($settings['theme']['font_loader_version']) : '1';
|
$settings['theme']['font_loader_version'] = $settings['theme']['font_loader_version'] != '' ? urlencode($settings['theme']['font_loader_version']) : '1';
|
||||||
$settings['theme']['message_delay'] = is_numeric($settings['theme']['message_delay']) ? 1000 * (float) $settings['theme']['message_delay'] : 3000;
|
$settings['theme']['message_delay'] = is_numeric($settings['theme']['message_delay']) ? 1000 * (float) $settings['theme']['message_delay'] : 3000;
|
||||||
$settings['theme']['menu_side_width_contracted'] = is_numeric($settings['theme']['menu_side_width_contracted']) ? $settings['theme']['menu_side_width_contracted'] : '60';
|
$settings['theme']['menu_side_width_contracted'] = is_numeric($settings['theme']['menu_side_width_contracted']) ? $settings['theme']['menu_side_width_contracted'] : '60';
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue