(bug 32508) clean up update.php messages

The user_options migration messages were not prefixed with '...' and
were split on several lines. This patch make the output messages more
inline with the existant ones.

Follow-up r103917

. <-- that is a patch of ink sorry.      ><OO>

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 0ad14a3..54767a0 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -657,7 +657,6 @@ abstract class DatabaseUpdater {
         */
        protected function doMigrateUserOptions() {
                $cl = $this->maintenance->runChild( 'ConvertUserOptions', 'convertUserOptions.php' );
-               $this->output( "Migrating remaining user_options... " );
                $cl->execute();
                $this->output( "done.\n" );
        }

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 5d76f85..da6ff9b 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -33,12 +33,12 @@ class ConvertUserOptions extends Maintenance {
        }
 
        public function execute() {
-               $this->output( "Beginning batch conversion of user options.\n" );
+               $this->output( "...batch conversion of user_options: " );
                $id = 0;
                $dbw = wfGetDB( DB_MASTER );
 
                if ( !$dbw->fieldExists( 'user', 'user_options', __METHOD__ ) ) {
-                       $this->output( "No user_options field in the user table. Nothing to migrate..." );
+                       $this->output( "nothing to migrate. " );
                        return;
                }
                while ( $id !== null ) {
@@ -57,7 +57,7 @@ class ConvertUserOptions extends Maintenance {
                                $this->output( "--Converted to ID $id\n" );
                        }
                }
-               $this->output( "Conversion done. Converted " . $this->mConversionCount . " user records.\n" );
+               $this->output( "done. Converted " . $this->mConversionCount . " user records.\n" );
        }
 
        /**