diff options
| author | patdenice <patdenice@piwigo.org> | 2009-03-03 22:39:08 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2009-03-03 22:39:08 +0000 |
| commit | 776812e507f879656797c3691cdff928fcb68d0e (patch) | |
| tree | bdea0aa38ae138bc63f2a10a307bd3d8a70ed1a0 /include/template.class.php | |
| parent | a1993b66d145ac59c536469122699b3da9477a49 (diff) | |
merge r3169 from trunk to branch 2.0
User's template extension must not be included in admin pages.
git-svn-id: http://piwigo.org/svn/branches/2.0@3170 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include/template.class.php')
| -rw-r--r-- | include/template.class.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/template.class.php b/include/template.class.php index 7f90d5c7c..386f3123a 100644 --- a/include/template.class.php +++ b/include/template.class.php @@ -84,7 +84,7 @@ class Template { $this->set_template_dir($root); - if (isset($conf['extents_for_templates'])) + if (!defined('IN_ADMIN') and isset($conf['extents_for_templates'])) { $tpl_extents = unserialize($conf['extents_for_templates']); $this->set_extents($tpl_extents, './template-extension/', true); |