From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 19 Feb 2011 11:49:14 +0000 (+0000)
Subject: Bug 27518: Updater calls PopulateLogSearch before adding logging.log_user_text; popul... 
X-Git-Tag: 1.31.0-rc.0~31902
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28%27votes%27%2C%20votes=%27waiting%27%29%20%7D%7D?a=commitdiff_plain;h=f5377b6d02e7521f02c5e4798006e85b0f9aa83f;p=lhc%2Fweb%2Fwiklou.git

Bug 27518: Updater calls PopulateLogSearch before adding logging.log_user_text; populateLogUsertext not called
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 89a22498fe..8b80825820 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -718,6 +718,7 @@ $wgAutoloadLocalClasses = array(
 	'DeleteDefaultMessages' => 'maintenance/deleteDefaultMessages.php',
 	'PopulateCategory' => 'maintenance/populateCategory.php',
 	'PopulateLogSearch' => 'maintenance/populateLogSearch.php',
+	'PopulateLogUsertext' => 'maintenance/populateLogUsertext.php',
 	'PopulateParentId' => 'maintenance/populateParentId.php',
 	'PopulateRevisionLength' => 'maintenance/populateRevisionLength.php',
 	'SevenZipStream' => 'maintenance/7zip.inc',
diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index 7668972700..063adc0558 100644
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -1,5 +1,8 @@
 <?php
 
+if ( !defined( 'MEDIAWIKI' ) )
+	die( 1 );
+
 /**
  * Special handling for image description pages
  *
@@ -7,10 +10,10 @@
  */
 class ImagePage extends Article {
 
-	private $img;  // Image object
-	private $displayImg;
-	private $repo;
-	private $fileLoaded;
+	/* private */ var $img;  // Image object
+	/* private */ var $displayImg;
+	/* private */ var $repo;
+	/* private */ var $fileLoaded;
 	var $mExtraDescription = false;
 	var $dupes;
 
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 6ba2df3ea4..abcea3309b 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -489,6 +489,21 @@ abstract class DatabaseUpdater {
 		$this->output( "...ss_active_users user count set...\n" );
 	}
 
+	protected function doLogUsertextPopulation() {
+		if ( $this->updateRowExists( 'populate log_usertext' ) ) {
+			$this->output( "...log_user_text field already populated.\n" );
+			return;
+		}
+
+		$this->output(
+			"Populating log_user_text field, printing progress markers. For large\n" .
+			"databases, you may want to hit Ctrl-C and do this manually with\n" .
+			"maintenance/populateLogUsertext.php.\n" );
+		$task = new PopulateLogUsertext();
+		$task->execute();
+		$this->output( "Done populating log_user_text field.\n" );
+	}
+
 	protected function doLogSearchPopulation() {
 		if ( $this->updateRowExists( 'populate log_search' ) ) {
 			$this->output( "...log_search table already populated.\n" );
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 03d91976a1..c3186f21c8 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -147,8 +147,9 @@ class MysqlUpdater extends DatabaseUpdater {
 			// 1.16
 			array( 'addTable', 'user_properties',                   'patch-user_properties.sql' ),
 			array( 'addTable', 'log_search',                        'patch-log_search.sql' ),
-			array( 'doLogSearchPopulation' ),
 			array( 'addField', 'logging',       'log_user_text',    'patch-log_user_text.sql' ),
+			array( 'doLogUsertextPopulation' ), # listed separately from the previous update because 1.16 was released without this update
+			array( 'doLogSearchPopulation' ),
 			array( 'addTable', 'l10n_cache',                        'patch-l10n_cache.sql' ),
 			array( 'addTable', 'external_user',                     'patch-external_user.sql' ),
 			array( 'addIndex', 'log_search',    'ls_field_val',     'patch-log_search-rename-index.sql' ),
diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index de49ffea75..5cbe67a833 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -30,8 +30,9 @@ class SqliteUpdater extends DatabaseUpdater {
 			// 1.16
 			array( 'addTable', 'user_properties',                   'patch-user_properties.sql' ),
 			array( 'addTable', 'log_search',                        'patch-log_search.sql' ),
-			array( 'doLogSearchPopulation' ),
 			array( 'addField', 'logging',       'log_user_text',    'patch-log_user_text.sql' ),
+			array( 'doLogUsertextPopulation' ), # listed separately from the previous update because 1.16 was released without this update
+			array( 'doLogSearchPopulation' ),
 			array( 'addTable', 'l10n_cache',                        'patch-l10n_cache.sql' ),
 			array( 'addTable', 'external_user',                     'patch-external_user.sql' ),
 			array( 'addIndex', 'log_search',    'ls_field_val',     'patch-log_search-rename-index.sql' ),