Skip to content

Commit 6b296b2

Browse files
committed
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
1 parent 3f8d84c commit 6b296b2

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

admin/themes/default/template/header.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
{foreach from=$themes item=theme}
1717
{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
18-
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.name}/theme.css">
18+
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css">
1919
{/foreach}
2020

2121
{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*}

include/template.class.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ function set_theme($root, $theme, $path)
9797
$this->set_theme($root, $themeconf['parent'], $path);
9898
}
9999

100-
$tpl_var = array('name' => $themeconf['name']);
100+
$tpl_var = array('id' => $theme);
101101
if (!empty($themeconf['local_head']) )
102102
{
103103
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );

themes/default/template/header.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
{foreach from=$themes item=theme}
3434
{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
35-
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.name}/theme.css">
35+
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
3636
{/foreach}
3737

3838
{if isset($U_PREFETCH) }<link rel="prefetch" href="{$U_PREFETCH}">{/if}

0 commit comments

Comments
 (0)