Guard load_modules() against the case that the database isn't installed.

1 files changed, 6 insertions, 0 deletions

diff --git a/core/helpers/module.php b/core/helpers/module.php
index b09f121d..eddac2f0 100644
--- a/core/helpers/module.php
+++ b/core/helpers/module.php
@@ -77,6 +77,12 @@ class module_Core {
   }
 
   public static function load_modules() {
+    // Lightweight hack to make sure that we've got a real install.
+    // @todo replace this when we have a better way of detecting that the core is installed
+    if (Kohana::config('database.default.connection.pass') == 'p@ssw0rd') {
+      return array();
+    }
+
     try {
       $modules = Kohana::config('core.modules');