Pasting lines typo in r80025

[lhc/web/wiklou.git] / includes / Block.php

diff --git a/includes/Block.php b/includes/Block.php
index d5169ef..162188c 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -24,7 +24,7 @@ class Block {
        const EB_RANGE_ONLY = 4;
 
        function __construct( $address = '', $user = 0, $by = 0, $reason = '',
-               $timestamp = '' , $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
+               $timestamp = 0, $auto = 0, $expiry = '', $anonOnly = 0, $createAccount = 0, $enableAutoblock = 0,
                $hideName = 0, $blockEmail = 0, $allowUsertalk = 0, $byName = false )
        {
                $this->mId = 0;
@@ -531,7 +531,7 @@ class Block {
                                # No results, don't autoblock anything
                                wfDebug( "No IP found to retroactively autoblock\n" );
                        } else {
-                               while ( $row = $dbr->fetchObject( $res ) ) {
+                               foreach ( $res as $row ) {
                                        if ( $row->rc_ip ) {
                                                $this->doAutoblock( $row->rc_ip );
                                        }
@@ -815,7 +815,7 @@ class Block {
                        // IPv6
                        if ( IP::isIPv6( $range ) && $parts[1] >= 64 && $parts[1] <= 128 ) {
                                $bits = $parts[1];
-                               $ipint = IP::toUnsigned6( $parts[0] );
+                               $ipint = IP::toUnsigned( $parts[0] );
                                # Native 32 bit functions WON'T work here!!!
                                # Convert to a padded binary number
                                $network = wfBaseConvert( $ipint, 10, 2, 128 );
@@ -849,25 +849,12 @@ class Block {
 
        /**
         * Get a value to insert into expiry field of the database when infinite expiry
-        * is desired. In principle this could be DBMS-dependant, but currently all
-        * supported DBMS's support the string "infinity", so we just use that.
+        * is desired
         *
         * @return String
         */
        public static function infinity() {
-               # This is a special keyword for timestamps in PostgreSQL, and
-               # works with CHAR(14) as well because "i" sorts after all numbers.
-
-                       # BEGIN DatabaseMssql hack
-                       # Since MSSQL doesn't recognize the infinity keyword, set date manually.
-                       # TO-DO: Refactor for better DB portability and remove magic date
-                       $dbr = wfGetDB( DB_SLAVE );
-                       if ( $dbr->getType() == 'mssql' ) {
-                               return '3000-01-31 00:00:00.000';
-                       }
-                       # End DatabaseMssql hack
-
-               return 'infinity';
+               return wfGetDB( DB_SLAVE )->getInfinity();
        }
 
        /**