Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284975
Change subject: Remove old WebResponse::setCookie() calling method
......................................................................
Remove old WebResponse::setCookie() calling method
Change-Id: Ibd548ea5bfe08f7fef35273c5a9c6c70c3faf60e
---
M includes/WebResponse.php
1 file changed, 0 insertions(+), 24 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/75/284975/1
diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 458c207..90b76e3 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -89,26 +89,12 @@
* path: string, cookie path ($wgCookiePath)
* secure: bool, secure attribute ($wgCookieSecure)
* httpOnly: bool, httpOnly attribute ($wgCookieHttpOnly)
- * raw: bool, if true uses PHP's setrawcookie() instead of
setcookie()
- * For backwards compatibility, if $options is not an array then it
and
- * the following two parameters will be interpreted as values for
- * 'prefix', 'domain', and 'secure'
* @since 1.22 Replaced $prefix, $domain, and $forceSecure with $options
*/
public function setCookie( $name, $value, $expire = 0, $options = [] ) {
global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
global $wgCookieSecure, $wgCookieExpiration, $wgCookieHttpOnly;
- if ( !is_array( $options ) ) {
- // Backwards compatibility
- $options = [ 'prefix' => $options ];
- if ( func_num_args() >= 5 ) {
- $options['domain'] = func_get_arg( 4 );
- }
- if ( func_num_args() >= 6 ) {
- $options['secure'] = func_get_arg( 5 );
- }
- }
$options = array_filter( $options, function ( $a ) {
return $a !== null;
} ) + [
@@ -268,16 +254,6 @@
global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
global $wgCookieSecure, $wgCookieExpiration, $wgCookieHttpOnly;
- if ( !is_array( $options ) ) {
- // Backwards compatibility
- $options = [ 'prefix' => $options ];
- if ( func_num_args() >= 5 ) {
- $options['domain'] = func_get_arg( 4 );
- }
- if ( func_num_args() >= 6 ) {
- $options['secure'] = func_get_arg( 5 );
- }
- }
$options = array_filter( $options, function ( $a ) {
return $a !== null;
} ) + [
--
To view, visit https://gerrit.wikimedia.org/r/284975
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd548ea5bfe08f7fef35273c5a9c6c70c3faf60e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
