Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

1 files changed, 8 insertions, 0 deletions

diff --git a/index.php b/index.php
index 03c044415..dae1ae751 100644
--- a/index.php
+++ b/index.php
@@ -65,6 +65,14 @@ function main()
 {
     global $user, $action;
 
+    if (!_have_config()) {
+        $msg = sprintf(_("No configuration file found. Try running ".
+                         "the installation program first."));
+        $sac = new ServerErrorAction($msg);
+        $sac->showPage();
+        return;
+    }
+
     // For database errors
 
     PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'handleError');