And we now have CSSMin

[lhc/web/wiklou.git] / maintenance / convertUserOptions.php

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 0f018b4..065904b 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -20,7 +20,7 @@
  * @ingroup Maintenance
  */
 
-require_once( "Maintenance.php" );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class ConvertUserOptions extends Maintenance {
 
@@ -36,9 +36,9 @@ class ConvertUserOptions extends Maintenance {
                $id = 0;
                $dbw = wfGetDB( DB_MASTER );
 
-               while ($id !== null) {
-                       $idCond = 'user_id>'.$dbw->addQuotes( $id );
-                       $optCond = "user_options!=".$dbw->addQuotes( '' ); // For compatibility
+               while ( $id !== null ) {
+                       $idCond = 'user_id>' . $dbw->addQuotes( $id );
+                       $optCond = "user_options!=" . $dbw->addQuotes( '' ); // For compatibility
                        $res = $dbw->select( 'user', '*',
                                        array( $optCond, $idCond ), __METHOD__,
                                        array( 'LIMIT' => 50, 'FOR UPDATE' ) );
@@ -47,7 +47,7 @@ class ConvertUserOptions extends Maintenance {
        
                        wfWaitForSlaves( 1 );
        
-                       if ($id)
+                       if ( $id )
                                $this->output( "--Converted to ID $id\n" );
                }
                $this->output( "Conversion done. Converted " . $this->mConversionCount . " user records.\n" );
@@ -55,7 +55,7 @@ class ConvertUserOptions extends Maintenance {
 
        function convertOptionBatch( $res, $dbw ) {
                $id = null;
-               while ($row = $dbw->fetchObject( $res ) ) {
+               foreach ( $res as $row ) {
                        $this->mConversionCount++;
        
                        $u = User::newFromRow( $row );