From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Mon, 23 May 2011 18:52:36 +0000 (+0000)
Subject: Follow-up r84475: Block::parseTarget() should always return an array.
X-Git-Tag: 1.31.0-rc.0~29988
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%29%20.%20%22?a=commitdiff_plain;h=d91b0ed998340479ab013a58f0a6886132e8b871;p=lhc%2Fweb%2Fwiklou.git

Follow-up r84475: Block::parseTarget() should always return an array.
---

diff --git a/includes/Block.php b/includes/Block.php
index 457ae714e1..df0dfd694c 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -1007,9 +1007,9 @@ class Block {
 		# We may have been through this before
 		if( $target instanceof User ){
 			if( IP::isValid( $target->getName() ) ){
-				return self::TYPE_IP;
+				return array( $target, self::TYPE_IP );
 			} else {
-				return self::TYPE_USER;
+				return array( $target, self::TYPE_USER );
 			}
 		} elseif( $target === null ){
 			return array( null, null );