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

Fixes #3961 Avoid conflicts with earlier themes that may have a 'layouts' folder.

Browse Source
This commit is contained in:
Cameron
2020-04-11 11:45:50 -07:00
parent 19aaffcbcc
commit 0e3f87cf25
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/menumanager_class.php
View File

@@ -2031,7 +2031,7 @@ class e_menu_layout
$theme = e107::pref('core','sitetheme'); $theme = e107::pref('core','sitetheme');
} }
$sql = e107::getDb(); $sql = e107::getDb(); // required
$tp = e107::getParser(); $tp = e107::getParser();
$HEADER = null; $HEADER = null;
@@ -2048,15 +2048,11 @@ class e_menu_layout
return false; return false;
} }
e107::set('css_enabled',false); e107::set('css_enabled',false);
e107::set('js_enabled',false); e107::set('js_enabled',false);
// new v2.2.2 HTML layout support. // new v2.2.2 HTML layout support.
if(is_dir($path."layouts")) if(is_dir($path."layouts") && is_readable($path."theme.html"))
{ {
$lyt = scandir($path."layouts"); $lyt = scandir($path."layouts");
$LAYOUT = array(); $LAYOUT = array();