Merge "build: Upgrade stylelint-config-wikimedia to 0.5.0 and make pass"

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

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 2423634..532ccb0 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -371,6 +371,10 @@ class MysqlUpdater extends DatabaseUpdater {
                                'patch-change_tag-change_tag_rc_tag_id.sql' ],
                        [ 'addField', 'ipblocks', 'ipb_sitewide', 'patch-ipb_sitewide.sql' ],
                        [ 'addTable', 'ipblocks_restrictions', 'patch-ipblocks_restrictions-table.sql' ],
+                       [ 'migrateImageCommentTemp' ],
+
+                       // 1,33
+                       [ 'dropField', 'change_tag', 'ct_tag', 'patch-drop-ct_tag.sql' ],
                ];
        }
 
@@ -601,7 +605,7 @@ class MysqlUpdater extends DatabaseUpdater {
 
                        foreach ( $rows as $row ) {
                                if ( $prev_title == $row->cur_title && $prev_namespace == $row->cur_namespace ) {
-                                       $deleteId[] = $row->cur_id;
+                                       $deleteId[] = (int)$row->cur_id;
                                }
                                $prev_title = $row->cur_title;
                                $prev_namespace = $row->cur_namespace;
@@ -930,7 +934,9 @@ class MysqlUpdater extends DatabaseUpdater {
                                if ( $count == 0 ) {
                                        $lbFactory = $services->getDBLoadBalancerFactory();
                                        $lbFactory->waitForReplication( [
-                                               'wiki' => wfWikiID(), 'timeout' => self::REPLICATION_WAIT_TIMEOUT ] );
+                                               'domain' => $lbFactory->getLocalDomainID(),
+                                               'timeout' => self::REPLICATION_WAIT_TIMEOUT
+                                       ] );
                                }
                                $this->db->insert( 'templatelinks',
                                        [