aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-04-29 12:45:27 +0000
committerpatdenice <patdenice@piwigo.org>2010-04-29 12:45:27 +0000
commita2ccb9a5c9394d83876fb76a97e2dc0b8557737b (patch)
treed62ddeb776512ebaa059a5d7f9d46320ad1c54e5 /include
parente7487082c32de87efd756bf05ae8539d38cda373 (diff)
feature 1502: Add $themeconf['load_parent_css'] parameter
git-svn-id: http://piwigo.org/svn/trunk@5991 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/template.class.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/include/template.class.php b/include/template.class.php
index ec813efb3..7a5baf5ef 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -102,7 +102,7 @@ class Template {
/**
* Load theme's parameters.
*/
- function set_theme($root, $theme, $path)
+ function set_theme($root, $theme, $path, $load_css=true)
{
$this->set_template_dir($root.'/'.$theme.'/'.$path);
@@ -110,10 +110,17 @@ class Template {
if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
{
- $this->set_theme($root, $themeconf['parent'], $path);
+ if (!isset($themeconf['load_parent_css']))
+ {
+ $themeconf['load_parent_css'] = true;
+ }
+ $this->set_theme($root, $themeconf['parent'], $path, $themeconf['load_parent_css']);
}
- $tpl_var = array('id' => $theme);
+ $tpl_var = array(
+ 'id' => $theme,
+ 'load_css' => $load_css,
+ );
if (!empty($themeconf['local_head']) )
{
$tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );