Merge "Rewrite pref cleanup script"

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

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 334ed27..cb40af3 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -43,12 +43,12 @@ class UpdateRestrictions extends Maintenance {
                $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__ );
 
@@ -59,7 +59,8 @@ class UpdateRestrictions extends Maintenance {
                $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' ],
@@ -125,5 +126,5 @@ class UpdateRestrictions extends Maintenance {
        }
 }
 
-$maintClass = "UpdateRestrictions";
+$maintClass = UpdateRestrictions::class;
 require_once RUN_MAINTENANCE_IF_MAIN;