From f02e457bb96e45f8f88a891911a35bcebbed8eab Mon Sep 17 00:00:00 2001
From: Phoenix Eve Aspacio <aspaciop@gmail.com>
Date: Tue, 14 Feb 2017 19:19:29 +0800
Subject: [PATCH] Update autodiscover.php

I guess we should leave the 'inc/vars.local.inc.php' below the config array so that the user can override the values of the array without loosing modifications everytime he/she updates.

However, I think things were different in the dockerized version, so maybe, ignore this PR if needed.
---
 data/web/autodiscover.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/data/web/autodiscover.php b/data/web/autodiscover.php
index bdb9c8d3..2d081a1b 100644
--- a/data/web/autodiscover.php
+++ b/data/web/autodiscover.php
@@ -1,9 +1,7 @@
 <?php
 require_once 'inc/vars.inc.php';
-if(file_exists('inc/vars.local.inc.php')) {
-	include_once 'inc/vars.local.inc.php';
-}
 ini_set('error_reporting', '0');
+
 $config = array(
      'useEASforOutlook' => 'yes',
      'autodiscoverType' => 'activesync',
@@ -23,6 +21,9 @@ $config = array(
 );
 
 /* ---------- DO NOT MODIFY ANYTHING BEYOND THIS LINE. IGNORE AT YOUR OWN RISK. ---------- */
+if(file_exists('inc/vars.local.inc.php')) {
+	include_once 'inc/vars.local.inc.php';
+}
 
 if ($config['useEASforOutlook'] == 'no') {
 	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Outlook')) {