From 79c1260cb55a86cd620110c1b6795dccb215fc18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Fri, 13 Jun 2014 22:09:25 +0200
Subject: [PATCH] improved config file loading

---
 application/core/Files/FileUtil.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/application/core/Files/FileUtil.php b/application/core/Files/FileUtil.php
index 1166eafd..f22f5fc1 100644
--- a/application/core/Files/FileUtil.php
+++ b/application/core/Files/FileUtil.php
@@ -83,7 +83,12 @@ abstract class FileUtil {
 			logMessage("Config File isn't readable! Please check the File Permissions. ({$fileName})");
 			return null;
 		}
-		return simplexml_load_file($fileLocation);
+		$configXml = @simplexml_load_file($fileLocation);
+		if (!$configXml) {
+			logMessage("Config file isn't maintained properly! ({$fileName})");
+			return null;
+		}
+		return $configXml;
 	}
 
 	/**