mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-04-30 09:18:09 +02:00
Code Issues Releases Wiki Activity

Upgrade and BC compatibility fix for menu rendering.

Browse Source
This commit is contained in:
Cameron 2013-03-18 02:16:04 -07:00
parent 4b6f69d26d
commit 86d77fa58b
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_core/templates/menu_template.php
View File

@ -6,7 +6,7 @@
$MENU_TEMPLATE['default']['start'] = '';
$MENU_TEMPLATE['default']['body'] = '{CMENUBODY}';
$MENU_TEMPLATE['default']['noTableRender'] = false;
$MENU_TEMPLATE['default']['noTableRender'] = true;
$MENU_TEMPLATE['button']['start'] = '<div class="cpage-menu">';

16
e107_handlers/menu_class.php
View File

@ -250,7 +250,7 @@ class e_menu
public function renderMenu($mpath, $mname='', $parm = '', $return = false)
{
// global $sql; // required at the moment.
global $sc_style, $e107_debug;
global $sc_style, $e107_debug, $style;
$e107 = e107::getInstance();
@ -278,7 +278,7 @@ class e_menu
$sql->select("page", "*", $query);
$page = $sql->fetch();
$caption = $tp->toHTML($page['page_title'], true, 'parse_sc, constants');
$caption = $tp->toHTML($page['menu_title'], true, 'parse_sc, constants');
if(vartrue($page['menu_template'])) // New v2.x templates. see core/menu_template.php
{
@ -290,19 +290,23 @@ class e_menu
$text = $tp->parseTemplate($template['body'], true, $page_shortcodes);
// echo "TEMPLATE= ($mpath)".$page['menu_template'];
// e107::getRender()->tablerender($caption, $text);
if($template['noTableRender'] !==true)
{
e107::getRender()->tablerender($caption, $text);
}
else
{
echo $text;
}
}
else
{
$text = $e107->tp->toHTML($page['page_text'], true, 'parse_sc, constants');
$text = $e107->tp->toHTML($page['menu_text'], true, 'parse_sc, constants');
e107::getRender()->tablerender($caption, $text);
}
}
else
{