Fixed content disappearence in member menu

diff --git a/inc/modules/login.php b/inc/modules/login.php
index 3ce8c164ac0da36fab055c5cfcb68bf56bbff089..40327c98b7954698ddb3b75fad11ab03034d97af 100644 (file)
--- 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("   </td>
   <td valign=\"top\" align=\"center\" rowspan=\"3\" class=\"member_content\">");

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 726ddbd2053f115cc376782e439317c299957269..a50e4e23fa8707ca9bd448082fc1cd1a6363cb18 100644 (file)
--- 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