1 files changed, 8 insertions, 6 deletions
diff --git a/modules/mediawiki/files/init_wiki.php b/modules/mediawiki/files/init_wiki.php
index 926c52fc..da1d46f5 100644
--- a/modules/mediawiki/files/init_wiki.php
+++ b/modules/mediawiki/files/init_wiki.php
@@ -2,6 +2,10 @@
 $wiki_root = $argv[1];
 $mw_root = '/usr/share/mediawiki';
 
+if (!is_dir("$wiki_root/config")) {
+    exit(1);
+}
+
 // DefaultSettings.php complain if not defined
 define('MEDIAWIKI',1);
 
@@ -11,12 +15,10 @@ require_once("$mw_root/includes/GlobalFunctions.php");
 include("$wiki_root/LocalSettings.php");
 
 $dbclass = 'Database'.ucfirst($wgDBtype);
-$dbc = new $dbclass;
-
-$wgDatabase = $dbc->newFromParams($wgDBserver,
-                                  $wgDBuser,
-                                  $wgDBpassword, $wgDBname, 1);
-
+$wgDatabase = new $dbclass($wgDBserver, 
+			$wgDBuser, 
+			$wgDBpassword, $wgDBname, 1);
+	
 $wgDatabase->initial_setup($wgDBpassword, $wgDBname);
 $wgDatabase->setup_database();