From d9022f63880ce039446fba8364f68e656b7bf4cb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 3 May 2012 13:01:35 +0200
Subject: Update to MediaWiki 1.19.0

---
 maintenance/populateLogUsertext.php | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'maintenance/populateLogUsertext.php')

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index e9e6926e..2b0e2d64 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -25,14 +25,22 @@
 
 require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
-class PopulateLogUsertext extends Maintenance {
+class PopulateLogUsertext extends LoggedUpdateMaintenance {
 	public function __construct() {
 		parent::__construct();
-		$this->mDescription = "Populates the log_user_text";
+		$this->mDescription = "Populates the log_user_text field";
 		$this->setBatchSize( 100 );
 	}
 
-	public function execute() {
+	protected function getUpdateKey() {
+		return 'populate log_usertext';
+	}
+
+	protected function updateSkippedMessage() {
+		return 'log_user_text column of logging table already populated.';
+	}
+
+	protected function doDBUpdates() {
 		$db = $this->getDB( DB_MASTER );
 		$start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
 		if ( !$start ) {
@@ -61,19 +69,8 @@ class PopulateLogUsertext extends Maintenance {
 			$blockEnd += $this->mBatchSize;
 			wfWaitForSlaves();
 		}
-		if ( $db->insert(
-				'updatelog',
-				array( 'ul_key' => 'populate log_usertext' ),
-				__METHOD__,
-				'IGNORE'
-			)
-		) {
-			$this->output( "log_usertext population complete.\n" );
-			return true;
-		} else {
-			$this->output( "Could not insert log_usertext population row.\n" );
-			return false;
-		}
+		$this->output( "Done populating log_user_text field.\n" );
+		return true;
 	}
 }
 
-- 
cgit v1.2.3-54-g00ecf