| Index: trunk/phase3/maintenance/convertUserOptions.php |
| — | — | @@ -33,12 +33,12 @@ |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | public function execute() { |
| 37 | | - $this->output( "Beginning batch conversion of user options.\n" ); |
| | 37 | + $this->output( "...batch conversion of user_options: " ); |
| 38 | 38 | $id = 0; |
| 39 | 39 | $dbw = wfGetDB( DB_MASTER ); |
| 40 | 40 | |
| 41 | 41 | if ( !$dbw->fieldExists( 'user', 'user_options', __METHOD__ ) ) { |
| 42 | | - $this->output( "No user_options field in the user table. Nothing to migrate..." ); |
| | 42 | + $this->output( "nothing to migrate. " ); |
| 43 | 43 | return; |
| 44 | 44 | } |
| 45 | 45 | while ( $id !== null ) { |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | $this->output( "--Converted to ID $id\n" ); |
| 59 | 59 | } |
| 60 | 60 | } |
| 61 | | - $this->output( "Conversion done. Converted " . $this->mConversionCount . " user records.\n" ); |
| | 61 | + $this->output( "done. Converted " . $this->mConversionCount . " user records.\n" ); |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | /** |
| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -657,7 +657,6 @@ |
| 658 | 658 | */ |
| 659 | 659 | protected function doMigrateUserOptions() { |
| 660 | 660 | $cl = $this->maintenance->runChild( 'ConvertUserOptions', 'convertUserOptions.php' ); |
| 661 | | - $this->output( "Migrating remaining user_options... " ); |
| 662 | 661 | $cl->execute(); |
| 663 | 662 | $this->output( "done.\n" ); |
| 664 | 663 | } |