Add a simple/cheap test to make sure that the database config is ok. …

…Fixes ticket #1029.
gallery · Jun 15, 2010 · 7e5661c · 7e5661c
1 parent b2afba1
commit 7e5661c
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/modules/gallery/hooks/init_gallery.php b/modules/gallery/hooks/init_gallery.php
@@ -24,6 +24,15 @@
   url::redirect(url::abs_file("installer"));
 }
 
+// Simple and cheap test to make sure that the database config is ok.  Do this before we do
+// anything else database related.
+try {
+  Database::instance()->connect();
+} catch (Kohana_PHP_Exception $e) {
+  print "Database configuration error.  Please check var/database.php";
+  exit;
+}
+
 Event::add("system.ready", array("Gallery_I18n", "instance"));
 Event::add("system.ready", array("module", "load_modules"));
 Event::add("system.ready", array("gallery", "ready"));