From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 11 Feb 2016 01:43:27 +0000 (+0000)
Subject: Merge "Allow changing cookie options in WebResponseSetCookie hook"
X-Git-Tag: 1.31.0-rc.0~8001
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=ab2d9f4ece915bf1b63d6e4a256b04a49e317c2b;hp=34d9f68c36301a8256997df0409722c75ed2be63;p=lhc%2Fweb%2Fwiklou.git

Merge "Allow changing cookie options in WebResponseSetCookie hook"
---

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 79bc5f522a..0fe888fe7e 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -3483,7 +3483,7 @@ Return false to prevent setting of the cookie.
 &$name: Cookie name passed to WebResponse::setcookie()
 &$value: Cookie value passed to WebResponse::setcookie()
 &$expire: Cookie expiration, as for PHP's setcookie()
-$options: Options passed to WebResponse::setcookie()
+&$options: Options passed to WebResponse::setcookie()
 
 'wfShellWikiCmd': Called when generating a shell-escaped command line string to
 run a MediaWiki cli script.
diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index fd48005398..e46d86f826 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -128,7 +128,7 @@ class WebResponse {
 
 		$func = $options['raw'] ? 'setrawcookie' : 'setcookie';
 
-		if ( Hooks::run( 'WebResponseSetCookie', array( &$name, &$value, &$expire, $options ) ) ) {
+		if ( Hooks::run( 'WebResponseSetCookie', array( &$name, &$value, &$expire, &$options ) ) ) {
 			$cookie = $options['prefix'] . $name;
 			$data = array(
 				'name' => (string)$cookie,