瀏覽代碼

Merge pull request #2329 from vain90/master

Move unset https_port after include of vars local inc
André Peters 6 年之前
父節點
當前提交
4d7f2618ad
共有 1 個文件被更改,包括 2 次插入1 次删除
  1. 2 1
      data/web/inc/prerequisites.inc.php

+ 2 - 1
data/web/inc/prerequisites.inc.php

@@ -1,10 +1,11 @@
 <?php
 <?php
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
 $default_autodiscover_config = $autodiscover_config;
 $default_autodiscover_config = $autodiscover_config;
-unset($https_port);
+
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
 if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
   include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
   include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
 }
 }
+unset($https_port);
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 
 
 header_remove("X-Powered-By");
 header_remove("X-Powered-By");