* (bug 7681, 11559) Cookie values no longer override GET and POST variables.

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

diff --git a/maintenance/updateRestrictions.php b/maintenance/updateRestrictions.php
index f93a3fe..c8cebfc 100644 (file)
--- a/maintenance/updateRestrictions.php
+++ b/maintenance/updateRestrictions.php
@@ -25,9 +25,9 @@ function migrate_page_restrictions( $db ) {
        $end = $db->selectField( 'page', 'MAX(page_id)', false, __FUNCTION__ );
        $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 !=''";
+               $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 ) ) {
@@ -36,10 +36,10 @@ function migrate_page_restrictions( $db ) {
                                $temp = explode( '=', trim( $restrict ) );
                                if(count($temp) == 1) {
                                        // old old format should be treated as edit/move restriction
-                                       $oldRestrictions["edit"] = explode( ',', trim( $temp[0] ) );
-                                       $oldRestrictions["move"] = explode( ',', trim( $temp[0] ) );
+                                       $oldRestrictions["edit"] = trim( $temp[0] );
+                                       $oldRestrictions["move"] = trim( $temp[0] );
                                } else {
-                                       $oldRestrictions[$temp[0]] = explode( ',', trim( $temp[1] ) );
+                                       $oldRestrictions[$temp[0]] = trim( $temp[1] );
                                }
                        }
                        # Update restrictions table
@@ -56,7 +56,7 @@ 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;
@@ -64,4 +64,4 @@ function migrate_page_restrictions( $db ) {
        }
 }
 
-?>
+