mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

don't load custompages from theme.php if theme.xml found.

Browse Source
This commit is contained in:
CaMer0n
2009-11-09 00:27:43 +00:00
parent 199ccc22e4
commit 31412ba4dd
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
e107_handlers/theme_handler.php
View File

@@ -9,8 +9,8 @@
* e107 Admin Theme Handler * e107 Admin Theme Handler
* *
* $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $ * $Source: /cvs_backup/e107_0.8/e107_handlers/theme_handler.php,v $
* $Revision: 1.63 $ * $Revision: 1.64 $
* $Date: 2009-11-09 00:13:59 $ * $Date: 2009-11-09 00:27:43 $
* $Author: e107coders $ * $Author: e107coders $
*/ */
@@ -1258,15 +1258,6 @@ class themeHandler
preg_match_all("#\\$"."CUSTOMFOOTER\[(\"|')(.*?)('|\")\].*?#",$themeContents,$match); preg_match_all("#\\$"."CUSTOMFOOTER\[(\"|')(.*?)('|\")\].*?#",$themeContents,$match);
$customFooterArray = $match[2]; $customFooterArray = $match[2];
foreach ($themeContentsArray as $line)
{
if(strstr($line, "CUSTOMPAGES"))
{
eval(str_replace("$", "\$", $line)); // detect arrays also.
}
}
if(!$themeArray['name']) if(!$themeArray['name'])
{ {
unset($themeArray); unset($themeArray);
@@ -1282,6 +1273,13 @@ class themeHandler
// load custompages from theme.php only when theme.xml doesn't exist. // load custompages from theme.php only when theme.xml doesn't exist.
if(!file_exists(e_THEME.$path."theme.xml")) if(!file_exists(e_THEME.$path."theme.xml"))
{ {
foreach ($themeContentsArray as $line)
{
if(strstr($line, "CUSTOMPAGES"))
{
eval(str_replace("$", "\$", $line)); // detect arrays also.
}
}
if(is_array($CUSTOMPAGES)) if(is_array($CUSTOMPAGES))
{ {