Update IPSet use statements

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

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 2f3fc36..c4dccbc 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -41,24 +41,26 @@ class UpdateRestrictions extends Maintenance {
 
        public function execute() {
                $db = $this->getDB( DB_MASTER );
+               $batchSize = $this->getBatchSize();
                if ( !$db->tableExists( 'page_restrictions' ) ) {
-                       $this->error( "page_restrictions table does not exist", true );
+                       $this->fatalError( "page_restrictions table does not exist" );
                }
 
                $start = $db->selectField( 'page', 'MIN(page_id)', false, __METHOD__ );
                if ( !$start ) {
-                       $this->error( "Nothing to do.", true );
+                       $this->fatalError( "Nothing to do." );
                }
                $end = $db->selectField( 'page', 'MAX(page_id)', false, __METHOD__ );
 
                # Do remaining chunk
-               $end += $this->mBatchSize - 1;
+               $end += $batchSize - 1;
                $blockStart = $start;
-               $blockEnd = $start + $this->mBatchSize - 1;
+               $blockEnd = $start + $batchSize - 1;
                $encodedExpiry = 'infinity';
                while ( $blockEnd <= $end ) {
                        $this->output( "...doing page_id from $blockStart to $blockEnd out of $end\n" );
-                       $cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
+                       $cond = "page_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd .
+                               " AND page_restrictions !=''";
                        $res = $db->select(
                                'page',
                                [ 'page_id', 'page_namespace', 'page_restrictions' ],
@@ -105,8 +107,8 @@ class UpdateRestrictions extends Maintenance {
                                        throw new MWException( "Deadlock loop failed wtf :(" );
                                }
                        }
-                       $blockStart += $this->mBatchSize - 1;
-                       $blockEnd += $this->mBatchSize - 1;
+                       $blockStart += $batchSize - 1;
+                       $blockEnd += $batchSize - 1;
                        wfWaitForSlaves();
                }
                $this->output( "...removing dead rows from page_restrictions\n" );