From: Chad Horohoe <chadh@wikimedia.org>
Date: Wed, 24 Sep 2014 20:38:17 +0000 (-0700)
Subject: Don't rely on $wgTitle in WebRequest
X-Git-Tag: 1.31.0-rc.0~13720^2
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/%7B%7B%20url_for%28%27vote%27%2C%20idvote=vote.voteid%29%20%7D%7D?a=commitdiff_plain;h=35e1c7cd67f6a8eb58f269c575dba581aa7f2f92;p=lhc%2Fweb%2Fwiklou.git

Don't rely on $wgTitle in WebRequest

All callers have been updated to provide their own getLocalUrl() calls as
appropriate, so deprecate calling appendQueryValue() and appendQueryArray()
with $onlyquery = false.

appendQuery() is now unused and deprecated as it always assumed $onlyquery = false

Change-Id: I142195c39f278165118a52143031008d9c68e01a
---

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index b187c4acef..48c3537bf4 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -705,21 +705,22 @@ class WebRequest {
 
 	/**
 	 * Take an arbitrary query and rewrite the present URL to include it
+	 * @deprecated Use appendQueryValue/appendQueryArray instead
 	 * @param string $query Query string fragment; do not include initial '?'
-	 *
 	 * @return string
 	 */
 	public function appendQuery( $query ) {
+		wfDeprecated( __METHOD__, '1.25' );
 		return $this->appendQueryArray( wfCgiToArray( $query ) );
 	}
 
 	/**
 	 * @param string $key
 	 * @param string $value
-	 * @param bool $onlyquery
+	 * @param bool $onlyquery [deprecated]
 	 * @return string
 	 */
-	public function appendQueryValue( $key, $value, $onlyquery = false ) {
+	public function appendQueryValue( $key, $value, $onlyquery = true ) {
 		return $this->appendQueryArray( array( $key => $value ), $onlyquery );
 	}
 
@@ -727,16 +728,21 @@ class WebRequest {
 	 * Appends or replaces value of query variables.
 	 *
 	 * @param array $array Array of values to replace/add to query
-	 * @param bool $onlyquery Whether to only return the query string and not the complete URL
+	 * @param bool $onlyquery Whether to only return the query string and not the complete URL [deprecated]
 	 * @return string
 	 */
-	public function appendQueryArray( $array, $onlyquery = false ) {
+	public function appendQueryArray( $array, $onlyquery = true ) {
 		global $wgTitle;
 		$newquery = $this->getQueryValues();
 		unset( $newquery['title'] );
 		$newquery = array_merge( $newquery, $array );
 		$query = wfArrayToCgi( $newquery );
-		return $onlyquery ? $query : $wgTitle->getLocalURL( $query );
+		if ( !$onlyquery ) {
+			wfDeprecated( __METHOD__, '1.25' );
+			return $wgTitle->getLocalURL( $query );
+		}
+
+		return $query;
 	}
 
 	/**