Merge branch 'master-2.26'

mantisbt · Feb 18, 2024 · 4dc35ad · 4dc35ad
2 parents e082b0c + e50fb20
commit 4dc35ad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/admin/install.php b/admin/install.php
@@ -139,7 +139,7 @@ function_exists( 'mysqli_stmt_get_result' ),
 
 layout_page_header_begin( 'Administration - Installation' );
 # Javascript is only needed to support input of installation options
-if( $t_install_state < 2 ) {
+if( $t_install_state <= 2 ) {
 	html_javascript_link( 'install.js' );
 }
 layout_page_header_end();

diff --git a/core.php b/core.php
@@ -137,6 +137,12 @@
 		exit( 1 );
 	}
 
+	# Do not load Core for dynamic javascript files when MantisBT is not installed
+	if( isset( $_SERVER['SCRIPT_NAME'] ) && ( 0 < strpos( $_SERVER['SCRIPT_NAME'], 'javascript' ) ) ) {
+		http_response_code( HTTP_STATUS_NO_CONTENT );
+		exit;
+	}
+
 	if( !( isset( $_SERVER['SCRIPT_NAME'] ) && ( 0 < strpos( $_SERVER['SCRIPT_NAME'], 'admin' ) ) ) ) {
 		header( 'Content-Type: text/html' );
 		# Temporary redirect (307) instead of Found (302) default

diff --git a/css/ace-mantis.css b/css/ace-mantis.css
@@ -602,6 +602,16 @@ ul.changelog > li, ul.roadmap > li {
   border-right-width: 0px;
 }
 
+.sidebar:not(.menu-min) {
+    min-width: 190px;
+    width: auto;
+}
+
+.sidebar.menu-min .nav-list > li > a > .menu-text {
+    width: max-content;
+    padding-right: 12px;
+}
+
 /* Small devices (tablets, 768px and up) */
 @media (min-width: 768px) {
     .page-content {
@@ -643,6 +653,10 @@ ul.changelog > li, ul.roadmap > li {
         margin-left: 43px !important;
     }
 
+    .sidebar:not(.min-width) {
+        min-width: auto;
+    }
+
     .sidebar.compact, .sidebar.compact.navbar-collapse {
         width: 125px;
     }