7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Web] Fix autodiscover merge on user.php

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

4
data/web/inc/prerequisites.inc.php
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';