Revert "Add ability to skip display of submenus"

This reverts commit 13264a7.
mantisbt · Oct 22, 2014 · cefd698 · cefd698
1 parent 74f3cb3
commit cefd698
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/core/authentication_api.php b/core/authentication_api.php
@@ -705,7 +705,6 @@ function auth_reauthenticate() {
  * @access public
  */
 function auth_reauthenticate_page( $p_user_id, $p_username ) {
-	global $g_skip_submenus;
 	$t_error = false;
 
 	if( true == gpc_get_bool( '_authenticate' ) ) {
@@ -719,7 +718,6 @@ function auth_reauthenticate_page( $p_user_id, $p_username ) {
 		}
 	}
 
-	$g_skip_submenus = true;
 	html_page_top();
 
 	?>

diff --git a/core/html_api.php b/core/html_api.php
@@ -115,9 +115,6 @@
 # flag for error handler to skip header menus
 $g_error_send_page_header = true;
 
-# flag to skip submenus
-$g_skip_submenus = false;
-
 $g_stylesheets_included = array();
 $g_scripts_included = array();
 
@@ -219,7 +216,6 @@ function html_page_top1( $p_page_title = null ) {
  * @return void
  */
 function html_page_top2() {
-	global $g_skip_submenus;
 	html_page_top2a();
 
 	if( !db_is_connected() ) {
@@ -251,14 +247,10 @@ function html_page_top2() {
 		} else {
 			$t_menu->include_div = true;
 		}
+		$t_menu->ToString();
 		if( $t_menu->name == 'main' ) {
-			$t_menu->ToString();
 			print_bug_jump();
 			echo '</div>' . "\n";
-		} else {
-			if( !$g_skip_submenus ) {
-				$t_menu->ToString();
-			}
 		}
 	}