From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Sat, 5 Jan 2013 19:31:35 +0000 (+0100)
Subject: Some fixes for Ia2782d64 (2f60cd2)
X-Git-Tag: 1.31.0-rc.0~21131^2
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=692a5d16f5478b11172e556c120286923209fa5f;p=lhc%2Fweb%2Fwiklou.git

Some fixes for Ia2782d64 (2f60cd2)

- Add doTable() check at the top of renameIndex()
- Return true instead of false when aborting an update due to unfulfilled
  condition; false is only to be used for updates that will be written to
  a schema update file to be run later
  Also removed the return false from addIndex() for consistency
- Break long line

Change-Id: I2efb6e3af4703ed8afeb315e8cda774d9a6c4a32
---

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index cd5f90b952..73574828ee 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -687,7 +687,6 @@ abstract class DatabaseUpdater {
 
 		if ( !$this->db->tableExists( $table, __METHOD__ ) ) {
 			$this->output( "...skipping: '$table' table doesn't exist yet.\n" );
-			return false;
 		} else if ( $this->db->indexExists( $table, $index, __METHOD__ ) ) {
 			$this->output( "...index $index already set on $table table.\n" );
 		} else {
@@ -752,17 +751,22 @@ abstract class DatabaseUpdater {
 	 * @return Boolean false if this was skipped because schema changes are skipped
 	 */
 	protected function renameIndex( $table, $oldIndex, $newIndex, $skipBothIndexExistWarning, $patch, $fullpath = false ) {
+		if ( !$this->doTable( $table ) ) {
+			return true;
+		}
+
 		// First requirement: the table must exist
 		if ( !$this->db->tableExists( $table, __METHOD__ ) ) {
 			$this->output( "...skipping: '$table' table doesn't exist yet.\n" );
-			return false;
+			return true;
 		}
 
 		// Second requirement: the new index must be missing
 		if ( $this->db->indexExists( $table, $newIndex, __METHOD__ ) ) {
 			$this->output( "...index $newIndex already set on $table table.\n" );
 			if ( !$skipBothIndexExistWarning && $this->db->indexExists( $table, $oldIndex, __METHOD__ ) ) {
-				$this->output( "...WARNING: $oldIndex still exists, despite it has been renamed into $newIndex (which also exists).\n            $oldIndex should be manually removed if not needed anymore.\n" );
+				$this->output( "...WARNING: $oldIndex still exists, despite it has been renamed into $newIndex (which also exists).\n" .
+					"            $oldIndex should be manually removed if not needed anymore.\n" );
 			}
 			return true;
 		}
@@ -770,7 +774,7 @@ abstract class DatabaseUpdater {
 		// Third requirement: the old index must exist
 		if ( !$this->db->indexExists( $table, $oldIndex, __METHOD__ ) ) {
 			$this->output( "...skipping: index $oldIndex doesn't exist.\n" );
-			return false;
+			return true;
 		}
 
 		// Requirements have been satisfied, patch can be applied