Additional commit for CFM-42

arlen · Jan 31, 2023 · 9aa6e82 · 9aa6e82
1 parent dc8e752
commit 9aa6e82
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/app/src/Application.php b/app/src/Application.php
@@ -58,13 +58,20 @@ public function bootstrap(): void
 
         // Load more plugins here
 
-        $Plugins = TableRegistry::getTableLocator()->get('Plugins');
+        try {
+            $Plugins = TableRegistry::getTableLocator()->get('Plugins');
 
-        $activePlugins = $Plugins->find('active')->all();
+            $activePlugins = $Plugins->find('active')->all();
 
-        foreach($activePlugins as $p) {
-            $this->addPlugin($p->plugin);
+            foreach($activePlugins as $p) {
+                $this->addPlugin($p->plugin);
+            }
+        }
+        catch(\Cake\Database\Exception\DatabaseException $e) {
+            // Most likely we are performing the initial database setup and
+            // the plugins table is missing.
         }
+        // Let any other exception bubble up
     }
 
     /**