Merge branch 'master-2.26'

mantisbt · Mar 10, 2024 · 966e132 · 966e132
2 parents f30b8e5 + 131a3d8
commit 966e132
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/admin/email_queue.php b/admin/email_queue.php
@@ -26,9 +26,6 @@
 
 require_once( dirname( __FILE__, 2 ) . '/core.php' );
 
-# Load schema version needed to render admin menu bar
-require_once( 'schema.php' );
-
 access_ensure_global_level( config_get_global( 'admin_site_threshold' ) );
 
 layout_page_header();

diff --git a/admin/index.php b/admin/index.php
@@ -24,7 +24,6 @@
  */
 
 require_once( dirname( __FILE__, 2 ) . '/core.php' );
-require_once( 'schema.php' );
 
 access_ensure_global_level( config_get_global( 'admin_site_threshold' ) );
 

diff --git a/admin/system_utils.php b/admin/system_utils.php
@@ -26,9 +26,6 @@
 
 require_once( dirname( __FILE__, 2 ) . '/core.php' );
 
-# Load schema version needed to render admin menu bar
-require_once( 'schema.php' );
-
 access_ensure_global_level( config_get_global( 'admin_site_threshold' ) );
 
 layout_page_header( 'MantisBT Administration - System Utilities' );

diff --git a/core/html_api.php b/core/html_api.php
@@ -948,8 +948,8 @@ function print_admin_menu_bar( $p_page ) {
 		# Relative URL up one level to ensure valid links on Admin Checks page
 		$t_path = '../';
 	} else {
-		global $g_upgrade;
-		include_once( 'schema.php' );
+		global $g_absolute_path, $g_upgrade;
+		require_once( $g_absolute_path . 'admin/schema.php' );
 		if( count( $g_upgrade ) - 1 != config_get( 'database_version', -1, ALL_USERS, ALL_PROJECTS ) ) {
 			$t_menu_items['install.php'] = 'Upgrade your installation';
 		}