From: Gabriel Wicke <gwicke@users.mediawiki.org>
Date: Fri, 18 Jun 2004 12:16:23 +0000 (+0000)
Subject: moved db user initialization before sysop creation, install fails otherwise as User... 
X-Git-Tag: 1.5.0alpha1~2825
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=2ed8aa746eda62f1bfb1e063bb608306c49d0415;p=lhc%2Fweb%2Fwiklou.git

moved db user initialization before sysop creation, install fails otherwise as User::saveSettings uses the non-root db connection
---

diff --git a/config/index.php b/config/index.php
index 0d1381d4a6..6eabb3f9af 100644
--- a/config/index.php
+++ b/config/index.php
@@ -466,6 +466,11 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			print "<li>Initializing data...";
 			$wgDatabase->query( "INSERT INTO site_stats (ss_row_id,ss_total_views," .
 				"ss_total_edits,ss_good_articles) VALUES (1,0,0,0)" );
+			# setting up the db user	
+			if( $conf->Root ) {
+				print "<li>Granting user permissions...</li>\n";
+				dbsource( "../maintenance/users.sql", $wgDatabase );
+			}
 			
 			if( $conf->SysopName ) {
 				$u = User::newFromName( $conf->getSysopName() );
@@ -513,11 +518,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			print "<li><pre>";
 			initialiseMessages();
 			print "</pre></li>\n";
-			
-			if( $conf->Root ) {
-				print "<li>Granting user permissions...</li>\n";
-				dbsource( "../maintenance/users.sql", $wgDatabase );
-			}
 		}
 
 		/* Write out the config file now that all is well */