aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-05-24 07:08:16 +0000
committerpatdenice <patdenice@piwigo.org>2010-05-24 07:08:16 +0000
commit0a2e040ae71fffe31d91943fd18feb6fccd97224 (patch)
treeeae59ba33a763dc51424a8ddf73293dc7ddc76fc
parentd1b62c1d58d7017f3cce7686cb62d2725214e6ee (diff)
Merge r6318 from trunk to branch 2.1.
$themeconf['id'] hard coded in template class git-svn-id: http://piwigo.org/svn/branches/2.1@6319 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/template.class.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/template.class.php b/include/template.class.php
index d3608af4b..161b7361e 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -135,6 +135,7 @@ class Template {
{
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );
}
+ $themeconf['id'] = $theme;
$this->smarty->append('themes', $tpl_var);
$this->smarty->append('themeconf', $themeconf, true);
}