Merge "Allow changing cookie options in WebResponseSetCookie hook"

diff --git a/docs/hooks.txt b/docs/hooks.txt
index 79bc5f5..0fe888f 100644 (file)
--- 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 fd48005..e46d86f 100644 (file)
--- 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,