MediaWiki 1.17.0

[autoinstalls/mediawiki.git] / maintenance / convertUserOptions.php

diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 657a82c12fd11dc24b1a9899af1dd6804b695df6..278d40ff303753fb89ec5abfdd2bd2482448a98f 100644 (file)
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -17,10 +17,11 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  */
 
-require_once( dirname(__FILE__) . '/Maintenance.php' );
+require_once( dirname( __FILE__ ) . '/Maintenance.php' );
 
 class ConvertUserOptions extends Maintenance {
 
@@ -30,24 +31,24 @@ class ConvertUserOptions extends Maintenance {
                parent::__construct();
                $this->mDescription = "Convert user options from old to new system";
        }
-       
+
        public function execute() {
                $this->output( "Beginning batch conversion of user options.\n" );
                $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' ) );
                        $id = $this->convertOptionBatch( $res, $dbw );
                        $dbw->commit();
-       
+
                        wfWaitForSlaves( 1 );
-       
-                       if ($id)
+
+                       if ( $id )
                                $this->output( "--Converted to ID $id\n" );
                }
                $this->output( "Conversion done. Converted " . $this->mConversionCount . " user records.\n" );
@@ -57,16 +58,16 @@ class ConvertUserOptions extends Maintenance {
                $id = null;
                foreach ( $res as $row ) {
                        $this->mConversionCount++;
-       
+
                        $u = User::newFromRow( $row );
-       
+
                        $u->saveSettings();
                        $id = $row->user_id;
                }
-       
+
                return $id;
        }
 }
 
 $maintClass = "ConvertUserOptions";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );