Sorry I forgot to commit the fix...

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

diff --git a/includes/Block.php b/includes/Block.php
index 781dd9d..6dab0d3 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -2,6 +2,7 @@
 /**
  * Blocks and bans object
  * @package MediaWiki
+ * $Id$
  */
 
 /**
@@ -33,9 +34,9 @@ class Block
                $this->mUser = $user;
                $this->mBy = $by;
                $this->mReason = $reason;
-               $this->mTimestamp = $timestamp;
+               $this->mTimestamp = wfTimestamp(TS_MW,$timestamp);
                $this->mAuto = $auto;
-               $this->mExpiry = $expiry;
+               $this->mExpiry = wfTimestamp(TS_MW,$expiry);
                
                $this->mForUpdate = false;
                $this->initialiseRange();
@@ -121,12 +122,12 @@ class Block
        {
                $this->mAddress = $row->ipb_address;
                $this->mReason = $row->ipb_reason;
-               $this->mTimestamp = $row->ipb_timestamp;
+               $this->mTimestamp = wfTimestamp(TS_MW,$row->ipb_timestamp);
                $this->mUser = $row->ipb_user;
                $this->mBy = $row->ipb_by;
                $this->mAuto = $row->ipb_auto;
                $this->mId = $row->ipb_id;
-               $this->mExpiry = $row->ipb_expiry;
+               $this->mExpiry = wfTimestamp(TS_MW,$row->ipb_expiry);
 
                $this->initialiseRange();
        }       
@@ -200,9 +201,9 @@ class Block
                                'ipb_user' => $this->mUser,
                                'ipb_by' => $this->mBy,
                                'ipb_reason' => $this->mReason,
-                               'ipb_timestamp' => $this->mTimestamp,
+                               'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
                                'ipb_auto' => $this->mAuto,
-                               'ipb_expiry' => $this->mExpiry,
+                               'ipb_expiry' => $dbw->timestamp($this->mExpiry),
                        ), 'Block::insert' 
                );
 
@@ -224,7 +225,7 @@ class Block
                if ( !$this->mExpiry ) {
                        return false;
                } else {
-                       return wfTimestampNow() > $this->mExpiry;
+                       return wfTimestamp() > $this->mExpiry;
                }
        }
 
@@ -236,14 +237,14 @@ class Block
        function updateTimestamp() 
        {
                if ( $this->mAuto ) {
-                       $this->mTimestamp = wfTimestampNow();
+                       $this->mTimestamp = wfTimestamp();
                        $this->mExpiry = Block::getAutoblockExpiry( $this->mTimestamp );
 
                        $dbw =& wfGetDB( DB_MASTER );
                        $dbw->updateArray( 'ipblocks', 
                                array( /* SET */ 
-                                       'ipb_timestamp' => $this->mTimestamp,
-                                       'ipb_expiry' => $this->mExpiry,
+                                       'ipb_timestamp' => $dbw->timestamp($this->mTimestamp),
+                                       'ipb_expiry' => $dbw->timestamp($this->mExpiry),
                                ), array( /* WHERE */
                                        'ipb_address' => $this->mAddress
                                ), 'Block::updateTimestamp' 
@@ -278,7 +279,7 @@ class Block
        /* static */ function getAutoblockExpiry( $timestamp )
        {
                global $wgAutoblockExpiry;
-               return wfUnix2Timestamp( wfTimestamp2Unix( $timestamp ) + $wgAutoblockExpiry );
+               return wfTimestamp( TS_MW, wfTimestamp( TS_UNIX, $timestamp ) + $wgAutoblockExpiry );
        }
 
        /* static */ function normaliseRange( $range )