Quietly skip trying to load config if there's an error in DB

[quix0rs-gnu-social.git] / classes / Config.php

diff --git a/classes/Config.php b/classes/Config.php
index ba0db588cafa1fee01c65c4d0cbd61ea53de24a8..bd191486cb8544c086e7cf4ee13bd2091e1e8a14 100644 (file)
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -59,9 +59,13 @@ class Config extends Managed_DataObject
 
     static function loadSettings()
     {
-        $settings = self::_getSettings();
-        if (!empty($settings)) {
-            self::_applySettings($settings);
+        try {
+            $settings = self::_getSettings();
+            if (!empty($settings)) {
+                self::_applySettings($settings);
+            }
+        } catch (Exception $e) {
+            return;
         }
     }