Allow error controller to continue without a config in case of config file error
Allow error controller to continue without a config in case of config file error

--- a/include/controller/ControllerBase.class.php
+++ b/include/controller/ControllerBase.class.php
@@ -168,7 +168,7 @@
 			}
 		}
 
-		if (empty($locale)) {
+		if (empty($locale) && $this->config) {
 			/*
 			 * No preference, fall back on setting
 			 */

--- a/include/controller/Controller_Message.class.php
+++ b/include/controller/Controller_Message.class.php
@@ -14,7 +14,10 @@
 	 */
 	public function __construct()
 	{
-		$this->InitializeConfig();
+		try {
+			$this->InitializeConfig();
+		} catch (Exception $e) {
+		}
 
 		$this->InitializeResource();
 

comments