From 96144a19af504a59b07ff39d378e7da1f6fcf240 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 29 Jul 2009 16:52:14 +0000 Subject: [PATCH] Fixed content disappearence in member menu --- inc/modules/login.php | 3 +++ inc/mysql-manager.php | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/inc/modules/login.php b/inc/modules/login.php index 3ce8c164ac..40327c98b7 100644 --- a/inc/modules/login.php +++ b/inc/modules/login.php @@ -79,6 +79,9 @@ if ((getConfig('member_menu') == 'Y') || (!EXT_IS_ACTIVE('sql_patches', true))) ADD_MENU('member', getModeAction('member', getWhat()), getWhat()); } // END - if +// Disable block-mode again +enableBlockMode(false); + // Menu -> content OUTPUT_HTML(" "); diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php index 726ddbd205..a50e4e23fa 100644 --- a/inc/mysql-manager.php +++ b/inc/mysql-manager.php @@ -426,8 +426,8 @@ function ADD_MENU ($mode, $act, $wht) { LOAD_TEMPLATE($mode . '_menu_title', false, $content); // Sub menu - $result_sub = SQL_QUERY_ESC("SELECT title AS sub_title, what AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`", - array($mode, $content['action']), __FUNCTION__, __LINE__); + $result_sub = SQL_QUERY_ESC("SELECT `title` AS sub_title, `what` AS sub_what FROM `{!_MYSQL_PREFIX!}_%s_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ".$AND." ORDER BY `sort`", + array($mode, $content['action']), __FUNCTION__, __LINE__); // Get number of rows $ctl = SQL_NUMROWS($result_sub); @@ -491,6 +491,8 @@ function ADD_MENU ($mode, $act, $wht) { } else { // This is a menu block... ;-) enableBlockMode(); + + // Load menu block $INC_BLOCK = sprintf("inc/modules/%s/action-%s.php", $mode, $content['action']); if (isFileReadable($INC_BLOCK)) { // Load include file -- 2.30.2