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
This commit is contained in:
parent
a1993b66d1
commit
776812e507
1 changed files with 1 additions and 1 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue