aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatdenice <patdenice@piwigo.org>2010-03-17 00:55:26 +0000
committerpatdenice <patdenice@piwigo.org>2010-03-17 00:55:26 +0000
commit54b9eea12dae32137575b4e254ca054eb4a75e1a (patch)
treeb5cf776b0144c236ad68eeeca20cfa0905b974e4
parentf82430dd3b92a2e37a58108fa81cd0bc6255fb00 (diff)
Feature 1502: Avoid 500 error if parent theme is the theme itself.
git-svn-id: http://piwigo.org/svn/trunk@5154 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/template.class.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php
index d982bbb8e..453266706 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -98,7 +98,7 @@ class Template {
include($root.'/'.$theme.'/themeconf.inc.php');
- if (isset($themeconf['parent']))
+ if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
{
$this->set_theme($root, $themeconf['parent'], $path);
}