X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Finstaller%2FDatabaseUpdater.php;h=b56ab62dac5037d8647d7d993169b5045f14bd74;hb=bb8c060128a79532e1b6885fb3ebd6174d3f4d4d;hp=04132ad5777401ef696357a14ee84a1afefa2dc3;hpb=ccc3d1fc0570c6e3057562b1583bd743aef5d9fb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 04132ad577..b56ab62dac 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -1257,10 +1257,15 @@ abstract class DatabaseUpdater {
 	 * @since 1.31
 	 */
 	protected function migrateArchiveText() {
-		$this->output( "Migrating archive ar_text to modern storage.\n" );
-		$task = $this->maintenance->runChild( MigrateArchiveText::class, 'migrateArchiveText.php' );
-		$task->execute();
-		$this->output( "done.\n" );
+		if ( $this->db->fieldExists( 'archive', 'ar_text', __METHOD__ ) ) {
+			$this->output( "Migrating archive ar_text to modern storage.\n" );
+			$task = $this->maintenance->runChild( MigrateArchiveText::class, 'migrateArchiveText.php' );
+			$task->setForce();
+			if ( $task->execute() ) {
+				$this->applyPatch( 'patch-drop-ar_text.sql', false,
+					'Dropping ar_text and ar_flags columns' );
+			}
+		}
 	}
 
 	/**