From: Domas Mituzas <midom@users.mediawiki.org>
Date: Thu, 9 Sep 2004 08:34:45 +0000 (+0000)
Subject: fix timestamps, change multirow insert query into Database:insertArray()
X-Git-Tag: 1.5.0alpha1~2043
X-Git-Url: http://git.cyclocoop.org/%27.%28%24current%20%3E%202?a=commitdiff_plain;h=b8d748ec3326a1c9d95ce277175301d1708b5625;p=lhc%2Fweb%2Fwiklou.git

fix timestamps, change multirow insert query into Database:insertArray()
---

diff --git a/maintenance/InitialiseMessages.inc b/maintenance/InitialiseMessages.inc
index 9f8da0d1cc..1f838f67d3 100755
--- a/maintenance/InitialiseMessages.inc
+++ b/maintenance/InitialiseMessages.inc
@@ -33,8 +33,6 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
 	# default messages won't be overwritte
 	$username = 'MediaWiki default';
 
-	$timestamp = wfTimestampNow();
-	$invTimestamp = wfInvertTimestamp( $timestamp );
 	
 	print "Initialising \"MediaWiki\" namespace...\n";
 
@@ -43,6 +41,9 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
 	$dbw =& wfGetDB( DB_MASTER );
 	$cur = $dbr->tableName( 'cur' );
 
+	$timestamp = wfTimestampNow();
+	$invTimestamp = wfInvertTimestamp( $timestamp );
+
 	$sql = "SELECT cur_title,cur_is_new,cur_user_text FROM $cur WHERE cur_namespace=$ns AND cur_title IN(";
 
 	# Get keys from $wgAllMessagesEn, which is more complete than the local language
@@ -89,10 +90,7 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
 
 	# Insert queries are done in one multi-row insert
 	# Here's the start of it:
-	$sql = "INSERT INTO $cur (cur_namespace, cur_title, cur_text,
-		cur_user_text, cur_timestamp, cur_restrictions,
-		cur_is_new, inverse_timestamp, cur_touched) VALUES 	";
-	$first = true;
+	$arr = array();
 	$talk = $wgLang->getNsText( NS_TALK );
 	$mwtalk = $wgLang->getNsText( NS_MEDIAWIKI_TALK );
 	
@@ -121,29 +119,20 @@ function initialiseMessages( $overwrite = false, $messageArray = false ) {
 			}
 			$doInsert = false;
 		} else {
-			# Queue for insertion
-			if ( $first ) {
-				$first = false;
-			} else {
-				$sql .= ',';
-			}
-			$sql .=
-			  "($ns,
-			  '$title',
-			  '$dbencMsg',
-			  '$username',
-			  '$timestamp',
-			  'sysop',
-			  1,
-			  '$invTimestamp',
-			  '$timestamp')";
+			array_push($arr,array(
+				cur_namespace=>$ns,
+				cur_title=>$title,
+				cur_text=>$dbencMsg,
+				cur_user_text=>$username,
+				cur_timestamp=>$dbw->timestamp($timestamp),
+				cur_restrictions=>'sysop',
+				cur_is_new=>1,
+				inverse_timestamp=>$invTimestamp,
+				cur_touched=>$dbw->timestamp($timestamp)));
 		}
 	}
 
-	# Perform the insert query
-	if ( !$first ) {
-		$dbw->query( $sql, $fname );
-	}
+	$dbw->insertArray( $cur, $arr, $fname );
 
 	# Clear the relevant memcached key
 	print 'Clearing message cache...';