Merge "Fix undefined $ok in DatabaseUpdater::migrateComments"

diff --combined includes/installer/DatabaseUpdater.php
index 79ea4f8,7970d5d..0d55454
--- 1/includes/installer/DatabaseUpdater.php
--- 2/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@@ -1047,7 -1047,7 +1047,7 @@@ abstract class DatabaseUpdater 
         * Sets the number of active users in the site_stats table
         */
        protected function doActiveUsersInit() {
 -              $activeUsers = $this->db->selectField( 'site_stats', 'ss_active_users', false, __METHOD__ );
 +              $activeUsers = $this->db->selectField( 'site_stats', 'ss_active_users', '', __METHOD__ );
                if ( $activeUsers == -1 ) {
                        $activeUsers = $this->db->selectField( 'recentchanges',
                                'COUNT( DISTINCT rc_user_text )',
@@@ -1227,7 -1227,7 +1227,7 @@@
                                "maintenance/migrateComments.php.\n"
                        );
                        $task = $this->maintenance->runChild( MigrateComments::class, 'migrateComments.php' );
-                       $task->execute();
+                       $ok = $task->execute();
                        $this->output( $ok ? "done.\n" : "errors were encountered.\n" );
                }
        }