mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 21:27:25 +02:00
Code Issues Releases Wiki Activity

Fix template array issue.

Browse Source
This commit is contained in:
Cameron
2013-06-01 14:15:46 -07:00
parent 9e8d238894
commit ce7c07ffda
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/e107_class.php
View File

@@ -1977,13 +1977,13 @@ class e107
// if(!$merge || !$override || !is_array($ret)) // problems merging when template doesn't exist in core. // if(!$merge || !$override || !is_array($ret)) // problems merging when template doesn't exist in core.
//XXX This appears to have less problems, but requires more testing.
if(!$merge && !$override) if((!$merge && !$override) || is_string($ret)) //XXX This appears to have less problems, but requires more testing.
{ {
return $ret; return $ret;
} }
if(!is_array($ret)) if(!is_array($ret)) // for the merge below.
{ {
$ret = array(); $ret = array();
} }