1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 10:04:35 +02:00

Download plugin cleanup and template upgrade. (Work in progress)

This commit is contained in:
Cameron
2013-06-22 18:24:43 -07:00
parent a5c9ff2cb9
commit fd5fbf6718
6 changed files with 1317 additions and 242 deletions

View File

@@ -2047,6 +2047,12 @@ class e107
}
$reg_path = 'plugin/'.$plug_name.'/templates/'.$id.($override ? '/ext' : '');
$path = self::templatePath($plug_name, $id, $override);
if(ADMIN && E107_DBG_INCLUDES)
{
e107::getMessage()->addDebug( "template path=".$path );
}
$id = str_replace('/', '_', $id);
$ret = self::_getTemplate($id, $key, $reg_path, $path, $info);
if(!$merge || !$override || !is_array($ret))
@@ -2057,6 +2063,10 @@ class e107
// merge
$reg_path = 'plugin/'.$plug_name.'/templates/'.$id;
$path = self::templatePath($plug_name, $id, false);
$id = str_replace('/', '_', $id);
$ret_plug = self::_getTemplate($id, $key, $reg_path, $path, $info);