mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-11 10:06:21 +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
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']['start'] = '';
$MENU_TEMPLATE['default']['body'] = '{CMENUBODY}'; $MENU_TEMPLATE['default']['body'] = '{CMENUBODY}';
$MENU_TEMPLATE['default']['noTableRender'] = false; $MENU_TEMPLATE['default']['noTableRender'] = true;
$MENU_TEMPLATE['button']['start'] = '<div class="cpage-menu">'; $MENU_TEMPLATE['button']['start'] = '<div class="cpage-menu">';

20
e107_handlers/menu_class.php
View File

@ -250,7 +250,7 @@ class e_menu
public function renderMenu($mpath, $mname='', $parm = '', $return = false) public function renderMenu($mpath, $mname='', $parm = '', $return = false)
{ {
// global $sql; // required at the moment. // global $sql; // required at the moment.
global $sc_style, $e107_debug; global $sc_style, $e107_debug, $style;
$e107 = e107::getInstance(); $e107 = e107::getInstance();
@ -278,7 +278,7 @@ class e_menu
$sql->select("page", "*", $query); $sql->select("page", "*", $query);
$page = $sql->fetch(); $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 if(vartrue($page['menu_template'])) // New v2.x templates. see core/menu_template.php
{ {
@ -289,20 +289,24 @@ class e_menu
// print_a($template['body']); // print_a($template['body']);
$text = $tp->parseTemplate($template['body'], true, $page_shortcodes); $text = $tp->parseTemplate($template['body'], true, $page_shortcodes);
// echo "TEMPLATE= ($mpath)".$page['menu_template']; // echo "TEMPLATE= ($mpath)".$page['menu_template'];
// e107::getRender()->tablerender($caption, $text); if($template['noTableRender'] !==true)
echo $text; {
e107::getRender()->tablerender($caption, $text);
}
else
{
echo $text;
}
} }
else 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); e107::getRender()->tablerender($caption, $text);
} }
} }
else else
{ {