From cfbc25c5a57b312bd0d0bd9e09e2e801fb48e227 Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Wed, 10 Feb 2016 15:49:08 -0700 Subject: [PATCH] Allow changing cookie options in WebResponseSetCookie hook Pass the cookie options by value to WebResponseSetCookie handlers so that they may alter them. Bug: T49647 Change-Id: I69ae55baa7806f14726b0b08215c0df471794b39 --- docs/hooks.txt | 2 +- includes/WebResponse.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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, -- 2.20.1