Merge "SECURITY: Fix permissions check for patrol action"

[lhc/web/wiklou.git] / includes / installer / DatabaseUpdater.php

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 82ccce2..8634f89 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -1278,6 +1278,22 @@ abstract class DatabaseUpdater {
                }
        }
 
+       /**
+        * Merge `image_comment_temp` into the `image` table
+        * @since 1.32
+        */
+       protected function migrateImageCommentTemp() {
+               global $wgCommentTableSchemaMigrationStage;
+               if ( $wgCommentTableSchemaMigrationStage > MIGRATION_OLD ) {
+                       $this->output( "Merging image_comment_temp into the image table\n" );
+                       $task = $this->maintenance->runChild(
+                               MigrateImageCommentTemp::class, 'migrateImageCommentTemp.php'
+                       );
+                       $ok = $task->execute();
+                       $this->output( $ok ? "done.\n" : "errors were encountered.\n" );
+               }
+       }
+
        /**
         * Migrate actors to the new 'actor' table
         * @since 1.31