Fixed bug with Contao 4

madeyourday · Aug 13, 2015 · e9afeac · e9afeac
1 parent 366bc3e
commit e9afeac
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/MadeYourDay/Contao/CustomElements.php b/src/MadeYourDay/Contao/CustomElements.php
@@ -1003,12 +1003,17 @@ public static function loadConfig($bypassCache = false)
 	{
 		// Don't load the config in the install tool
 		if (version_compare(VERSION, '4.0', '>=')) {
-			if (\System::getContainer()->get('request')->get('_route') === 'contao_backend_install') {
+			try {
+				if (\System::getContainer()->get('request')->get('_route') === 'contao_backend_install') {
+					return;
+				}
+			}
+			catch (\Exception $exception) {
 				return;
 			}
 		}
 		else {
-			if (\Environment::get('script') === 'contao/install.php') {
+			if (\Environment::get('script') === 'contao/install.php' || \Environment::get('script') === 'install.php') {
 				return;
 			}
 		}