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

Chatbox class warning issue and template override/merge issue (requires more testing)

Browse Source
This commit is contained in:
Cameron
2013-06-01 14:02:46 -07:00
parent 693b5bea75
commit 4776f49964
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
e107_handlers/e107_class.php
View File

@@ -1974,17 +1974,28 @@ class e107
$path = self::coreTemplatePath($id, $override); $path = self::coreTemplatePath($id, $override);
$id = str_replace('/', '_', $id); $id = str_replace('/', '_', $id);
$ret = self::_getTemplate($id, $key, $reg_path, $path, $info); $ret = self::_getTemplate($id, $key, $reg_path, $path, $info);
if(!$merge || !$override || !is_array($ret))
// 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)
{ {
return $ret; return $ret;
} }
if(!is_array($ret))
{
$ret = array();
}
// print_a($id ." ". $key ." ". $reg_path." ". $path." ".$info);
// merge // merge
$reg_path = 'core/e107/templates/'.$id; $reg_path = 'core/e107/templates/'.$id;
$path = self::coreTemplatePath($id, false); $path = self::coreTemplatePath($id, false);
$id = str_replace('/', '_', $id); $id = str_replace('/', '_', $id);
$ret_core = self::_getTemplate($id, $key, $reg_path, $path, $info); $ret_core = self::_getTemplate($id, $key, $reg_path, $path, $info);
return (is_array($ret_core) ? array_merge($ret_core, $ret) : $ret); return (is_array($ret_core) ? array_merge($ret_core, $ret) : $ret);
} }
@@ -3542,7 +3553,7 @@ class e107
break; break;
} }
if($filename) if($filename && is_file($filename)) // Test with chatbox_menu
{ {
// autoload doesn't REQUIRE files, because this will break things like call_user_func() // autoload doesn't REQUIRE files, because this will break things like call_user_func()
include($filename); include($filename);