Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(bug 32508) clean up update.php messages

Browse source 
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>
This commit is contained in:
Antoine Musso 2011-12-08 10:04:59 +00:00
parent 944a2cbf65
commit a4a025ee54
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
includes/installer/DatabaseUpdater.php
View file

@ -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" );
}

6
maintenance/convertUserOptions.php
View file

@ -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" );
}
/**