Redirect on login instead of showing a message

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

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index 6c8ffb5..c2d256e 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -1,10 +1,12 @@
 <?php
-
-/*
+/**
  * Makes the required database updates for Special:ProtectedPages
  * to show all protected pages, even ones before the page restrictions
  * schema change. All remaining page_restriction column values are moved
  * to the new table.
+ *
+ * @file
+ * @ingroup Maintenance
  */
 
 define( 'BATCH_SIZE', 100 );
@@ -23,11 +25,14 @@ function migrate_page_restrictions( $db ) {
        
        $start = $db->selectField( 'page', 'MIN(page_id)', false, __FUNCTION__ );
        $end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
+       # Do remaining chunk
+       $end += BATCH_SIZE - 1;
        $blockStart = $start;
        $blockEnd = $start + BATCH_SIZE - 1;
-       $encodedExpiry = Block::decodeExpiry('');
+       $encodedExpiry = 'infinity';
        while ( $blockEnd <= $end ) {
-               $cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !=''";
+               echo "...doing page_id from $blockStart to $blockEnd\n";
+               $cond = "page_id BETWEEN $blockStart AND $blockEnd AND page_restrictions !='' AND page_restrictions !='edit=:move='";
                $res = $db->select( 'page', array('page_id', 'page_restrictions'), $cond, __FUNCTION__ );
                $batch = array();
                while ( $row = $db->fetchObject( $res ) ) {
@@ -56,12 +61,12 @@ function migrate_page_restrictions( $db ) {
                # We use insert() and not replace() as Article.php replaces
                # page_restrictions with '' when protected in the restrictions table
                if ( count( $batch ) ) {
-                       $db->insert( 'page_restrictions', $batch, __FUNCTION__ );
+                       $db->insert( 'page_restrictions', $batch, __FUNCTION__, array( 'IGNORE' ) );
                }
-               $blockStart += BATCH_SIZE;
-               $blockEnd += BATCH_SIZE;
+               $blockStart += BATCH_SIZE - 1;
+               $blockEnd += BATCH_SIZE - 1;
                wfWaitForSlaves( 5 );
        }
 }
 
-?>
+