From: Reedy <reedy@wikimedia.org>
Date: Thu, 9 Aug 2012 13:54:46 +0000 (+0100)
Subject: Followup for bug 39099
X-Git-Tag: 1.31.0-rc.0~22790
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=6c8378711d2d59eb73ce9c64813c3686a965a456;p=lhc%2Fweb%2Fwiklou.git

Followup for bug 39099

If we're not passed an array, try and make it one..

Change-Id: I269848d08893cecfb0ac4de87a3155c916981a8d
---

diff --git a/includes/Uri.php b/includes/Uri.php
index 93540689b4..f6cf06f03f 100644
--- a/includes/Uri.php
+++ b/includes/Uri.php
@@ -253,15 +253,13 @@ class Uri {
 	 * @return Uri this URI object
 	 */
 	public function extendQuery( $parameters ) {
-		if ( is_string( $parameters ) ) {
+		if ( !is_array( $parameters ) ) {
 			$parameters = wfCgiToArray( $parameters );
 		}
 
 		$query = $this->getQuery();
-		if ( count( $parameters ) ) {
-			foreach( $parameters as $key => $value ) {
-				$query[$key] = $value;
-			}
+		foreach( $parameters as $key => $value ) {
+			$query[$key] = $value;
 		}
 
 		$this->setQuery( $query );