diff options
| author | plegall <plg@piwigo.org> | 2010-03-19 13:30:21 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2010-03-19 13:30:21 +0000 |
| commit | 6b296b293d7ac666548ec74cecf827699f912ff7 (patch) | |
| tree | 4594d284f96b3279dcf92c1a41d43703e8d6d44a | |
| parent | 3f8d84cbe690d94871f15957b3a233e6d23b5be3 (diff) | |
feature 1502: replace the theme.name by theme.id for theme.css load
git-svn-id: http://piwigo.org/svn/trunk@5190 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | admin/themes/default/template/header.tpl | 2 | ||||
| -rw-r--r-- | include/template.class.php | 2 | ||||
| -rw-r--r-- | themes/default/template/header.tpl | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl index 7b492aeb1..d767a78ae 100644 --- a/admin/themes/default/template/header.tpl +++ b/admin/themes/default/template/header.tpl @@ -15,7 +15,7 @@ {foreach from=$themes item=theme} {if isset($theme.local_head)}{include file=$theme.local_head}{/if} -<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css"> {/foreach} {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*} diff --git a/include/template.class.php b/include/template.class.php index 86200a978..030b352be 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -97,7 +97,7 @@ class Template { $this->set_theme($root, $themeconf['parent'], $path); } - $tpl_var = array('name' => $themeconf['name']); + $tpl_var = array('id' => $theme); if (!empty($themeconf['local_head']) ) { $tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] ); diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index b6298ec3e..b83c54c8c 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -32,7 +32,7 @@ {foreach from=$themes item=theme} {if isset($theme.local_head)}{include file=$theme.local_head}{/if} -<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.name}/theme.css"> +<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css"> {/foreach} {if isset($U_PREFETCH) }<link rel="prefetch" href="{$U_PREFETCH}">{/if} |