From d7aadf50124860071e0f022d7861451d60511cf3 Mon Sep 17 00:00:00 2001 From: Cameron Date: Wed, 27 Jan 2021 12:53:45 -0800 Subject: [PATCH] Removed admin_template from bootstrap3. Using core template instead. Switched admin navigation parser to simpleParse() --- e107_handlers/sitelinks_class.php | 3 +- e107_tests/tests/unit/e107Test.php | 2 - e107_themes/bootstrap3/admin_template.php | 331 ---------------------- 3 files changed, 1 insertion(+), 335 deletions(-) delete mode 100644 e107_themes/bootstrap3/admin_template.php diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php index ca63d3d5d..53adfce33 100644 --- a/e107_handlers/sitelinks_class.php +++ b/e107_handlers/sitelinks_class.php @@ -1386,8 +1386,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; } } - // $text .= preg_replace($search, $replace, $temp); - $text .= $tp->parseTemplate($temp, false, $replace); // ($search, $replace, $temp); + $text .= $tp->simpleParse($temp, $replace); // echo "
".$title." act=".$act; //print_a($e107_vars[$act]); } diff --git a/e107_tests/tests/unit/e107Test.php b/e107_tests/tests/unit/e107Test.php index defe4ada8..bdf0e7477 100644 --- a/e107_tests/tests/unit/e107Test.php +++ b/e107_tests/tests/unit/e107Test.php @@ -1024,8 +1024,6 @@ class e107Test extends \Codeception\Test\Unit $exclude = array( - // 'admin_icons_template.php', - 'admin_template.php',// FIXME - convert the template to v2.x standards. 'bbcode_template.php', 'online_template.php', // FIXME - convert the template to v2.x standards. 'sitedown_template.php', // FIXME - convert the template to v2.x standards. diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php deleted file mode 100644 index 372a12280..000000000 --- a/e107_themes/bootstrap3/admin_template.php +++ /dev/null @@ -1,331 +0,0 @@ -'; - -$E_ADMIN_NAVIGATION['start_other'] = '