check for load_config better so it doesn't throw exceptions when we're

already in the installer

htdocs/init.php

@@ -68,6 +68,7 @@ if (!isset($CFG->wwwroot)) {
 // core libraries
 require('mahara.php');
 require('dml.php');
+require('ddl.php');
 require('constants.php');
 require('web.php');
 require('session.php');
@@ -108,8 +109,14 @@ catch (Exception $e) {
     // nice message should be displayed explaining the problem etc. etc.
     throw new Exception($errormessage);
 }
-
-load_config();
+try {
+    load_config();
+} 
+catch (DatalibException $e) {
+    if (!defined('INSTALLER')) {
+        throw $e;
+    }
+}
 
 if (!get_config('theme')) { 
     // if it's not set, we're probably not installed,