Merge "Revert "RedirectSpecialPage: handle interwiki redirects.""

[lhc/web/wiklou.git] / maintenance / migrateArchiveText.php

diff --git a/maintenance/migrateArchiveText.php b/maintenance/migrateArchiveText.php
index e9beaa3..71fff56 100644 (file)
--- a/maintenance/migrateArchiveText.php
+++ b/maintenance/migrateArchiveText.php
@@ -24,7 +24,7 @@
 require_once __DIR__ . '/Maintenance.php';
 
 /**
- * Maintenance script that migrates archive.ar_text and ar_flags to modern storage
+ * Maintenance script that migrates archive.ar_text and ar_flags to text storage
  *
  * @ingroup Maintenance
  * @since 1.31
@@ -33,7 +33,7 @@ class MigrateArchiveText extends LoggedUpdateMaintenance {
        public function __construct() {
                parent::__construct();
                $this->addDescription(
-                       'Migrates comments from pre-1.5 ar_text and ar_flags columns to modern storage'
+                       'Migrates content from pre-1.5 ar_text and ar_flags columns to text storage'
                );
                $this->addOption(
                        'replace-missing',
@@ -98,9 +98,6 @@ class MigrateArchiveText extends LoggedUpdateMaintenance {
 
                                                if ( $wgDefaultExternalStore ) {
                                                        $data = ExternalStore::insertToDefault( $data );
-                                                       if ( !$data ) {
-                                                               throw new MWException( "Unable to store text to external storage" );
-                                                       }
                                                        if ( $flags ) {
                                                                $flags .= ',';
                                                        }
@@ -143,7 +140,7 @@ class MigrateArchiveText extends LoggedUpdateMaintenance {
                        }
 
                        $this->output( "... $last\n" );
-                       // $this->commitTransaction() already waited for slaves, no need to re-wait here.
+                       // $this->commitTransaction() already waited for replication; no need to re-wait here
                }
 
                $this->output( "Completed ar_text migration, $count rows updated, $errors missing data.\n" );