mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

Remove deprecated $HEADER / $FOOTER from bootstrap3 theme to avoid confusing developers.

Browse Source
This commit is contained in:
Cameron
2017-02-04 13:45:11 -08:00
parent 479cdd7d8f
commit 238756446c
4 changed files with 57 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/menus.php
View File

@@ -42,7 +42,7 @@ require_once("../class2.php");
if(e_MENUMANAGER_ACTIVE === false )
{
if(!deftrue("e_DEBUG_MENUMANAGER"))
if(!deftrue("e_DEBUG"))
{
e107::getJs()->inlineCSS('
@@ -879,7 +879,7 @@ class e_menu_layout
{
$template = $head[$k]."\n{---}".$foot[$k];
$layout['templates'][$k] = $template;
$layout['menus'][$k] = self::countMenus($template);
$layout['menus'][$k] = self::countMenus($template, $k);
}
@@ -889,7 +889,7 @@ class e_menu_layout
}
private static function countMenus($template)
private static function countMenus($template, $name)
{
if(preg_match_all("/\{MENU=([\d]{1,3})(:[\w\d]*)?\}/", $template, $matches))
{
@@ -897,6 +897,8 @@ class e_menu_layout
return $matches[1];
}
e107::getDebug()->log("No Menus Found in Template:".$name." with strlen: ".strlen($template));
return array();
}

6
e107_admin/plugin.php
View File

@@ -1247,6 +1247,8 @@ class pluginManager{
$text = "";
$plg = e107::getPlug();
foreach($pluginList as $plug)
{
e107::loadLanFiles($plug['plugin_path'],'admin');
@@ -1264,10 +1266,10 @@ class pluginManager{
$plugin_config_icon = "";
if(deftrue('e_DEBUG_PLUGMANAGER'))
{
$plug_vars = e107::getPlug()->getMeta($plug['plugin_path']);
$plg->load($plug['plugin_path']);
$plug_vars = $plg->getMeta();
}
else
{