amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-10-13 07:17:11 +00:00
Code Issues Projects Releases Wiki Activity

[Web] Fix autodiscover merge on user.php

Browse Source
This commit is contained in:
andryyy committed 2017-09-16 13:33:27 +02:00
1 parent e20d31e440
commit c6f81fe67b
4 files changed
+39 -40
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/web/inc/prerequisites.inc.php
+3 -1
View File
@@ -1,8 +1,10 @@
<?php
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
require_once 'inc/vars.inc.php';
$default_autodiscover_config = $autodiscover_config;
if (file_exists($_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php')) {
include_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.local.inc.php';
}
$autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/sessions.inc.php';