Просмотр исходного кода

Fix prefixes not getting set correctly (#3171)

* Fix prefixes not getting set correctly

* Fix weird CSS issue
Jakob Bouchard 3 лет назад
Родитель
Сommit
559aece5dc
1 измененных файлов с 7 добавлено и 6 удалено
  1. 7 6
      web/inc/main.php

+ 7 - 6
web/inc/main.php

@@ -175,20 +175,21 @@ function render_page($user, $TAB, $page) {
 	$__template_dir = dirname(__DIR__) . "/templates/";
 	$__pages_js_dir = dirname(__DIR__) . "/js/pages/";
 
+	// Extract global variables
+	// I think those variables should be passed via arguments
+	extract($GLOBALS, EXTR_SKIP);
+
 	// Header
 	include $__template_dir . "header.php";
 
+	// Panel
+	$panel = top_panel(empty($_SESSION["look"]) ? $_SESSION["user"] : $_SESSION["look"], $TAB);
+
 	// Including page specific js file
 	if (file_exists($__pages_js_dir . $page . ".js")) {
 		echo '<script defer src="/js/pages/' . $page . ".js?" . JS_LATEST_UPDATE . '"></script>';
 	}
 
-	// Panel
-	$panel = top_panel(empty($_SESSION["look"]) ? $_SESSION["user"] : $_SESSION["look"], $TAB);
-	// Extract global variables
-	// I think those variables should be passed via arguments
-	extract($GLOBALS, EXTR_SKIP);
-
 	// Policies controller
 	@include_once dirname(__DIR__) . "/inc/policies.php";