From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Wed, 8 Aug 2012 08:42:17 +0000 (+0200)
Subject: Follow-up I47412b67: pass an array of query parameters to Linker::link()
X-Git-Tag: 1.31.0-rc.0~22804^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=29ad3b3991a3c8a9705147a4d273fc3d7a7707da;p=lhc%2Fweb%2Fwiklou.git

Follow-up I47412b67: pass an array of query parameters to Linker::link()

Spotted by Daniel Werner in that change.

Change-Id: I8ded52b8285b2af0f69cc586abe532ea56cc18bb
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6c1ac4bd10..a9c7d1464a 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1725,7 +1725,7 @@ class OutputPage extends ContextSource {
 	/**
 	 * Return a Vary: header on which to vary caches. Based on the keys of $mVaryHeader,
 	 * such as Accept-Encoding or Cookie
-	 * 
+	 *
 	 * @return String
 	 */
 	public function getVaryHeader() {
@@ -2351,7 +2351,7 @@ $templates
 	 * Add a "return to" link pointing to a specified title
 	 *
 	 * @param $title Title to link
-	 * @param $query String query string
+	 * @param $query Array query string parameters
 	 * @param $text String text of the link (input is not escaped)
 	 */
 	public function addReturnTo( $title, $query = array(), $text = null ) {
@@ -2391,7 +2391,7 @@ $templates
 			$titleObj = Title::newMainPage();
 		}
 
-		$this->addReturnTo( $titleObj, $returntoquery );
+		$this->addReturnTo( $titleObj, wfCgiToArray( $returntoquery ) );
 	}
 
 	/**