From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Tue, 14 Aug 2012 09:51:26 +0000 (+0200)
Subject: Follow-up I47412b67 (dde8471): convert string query to array
X-Git-Tag: 1.31.0-rc.0~22745
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=419129ae672b4d09e1cfccb9a452cca29ad30fa1;p=lhc%2Fweb%2Fwiklou.git

Follow-up I47412b67 (dde8471): convert string query to array

If we detect and warn that the $query parameter is in an incorrect
format, we may as well convert it to the correct one.

Change-Id: Ief137ab758c65ec562c2a523f76b1a4f8c2617b5
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 9949aa85a0..5b1f0ff082 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -202,6 +202,7 @@ class Linker {
 		if( is_string( $query ) ) {
 			// some functions withing core using this still hand over query strings
 			wfDeprecated( __METHOD__ . ' with parameter $query as string (should be array)', '1.20' );
+			$query = wfCgiToArray( $query );
 		}
 		$options = (array)$options;