From: Brian Wolff <bawolff@users.mediawiki.org>
Date: Sun, 26 Dec 2010 04:38:41 +0000 (+0000)
Subject: (Bug 26425) Due to r71751, wfTimestamp stopped accepting '' to mean get
X-Git-Tag: 1.31.0-rc.0~33086
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=2b1a4c92d43f4664077e586f0cdc3bdb243ac7ab;p=lhc%2Fweb%2Fwiklou.git

(Bug 26425) Due to r71751, wfTimestamp stopped accepting '' to mean get
current timestamp. This caused Block::__construct to put all sort of
messages in the debug log about invalid timestamp. So change Block to use
timestamp of 0 instead of '' if unspecified.
---

diff --git a/includes/Block.php b/includes/Block.php
index 17ebeb218c..7c5f0ddd72 100644
--- 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;