From c2c40b2b9b18457de40f7bda43c4f32edea05275 Mon Sep 17 00:00:00 2001 From: Tyler Anthony Romeo Date: Tue, 30 Apr 2013 13:07:40 -0400 Subject: [PATCH] Fixed $wgCookieExpiration functionality when set to 0. When $wgCookieExpiration is set to 0, cookies should by default expire when the browser closes. However, MediaWiki accidentally interpreted this as the cookies expiring 0 seconds from the request time. Bug: 47886 Change-Id: Ib988ad18574122a56b0d11c8888c7c41d94dea6e --- includes/WebResponse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/WebResponse.php b/includes/WebResponse.php index 0deae965ac..c2193fbd84 100644 --- a/includes/WebResponse.php +++ b/includes/WebResponse.php @@ -54,7 +54,7 @@ class WebResponse { public function setcookie( $name, $value, $expire = 0, $prefix = null, $domain = null, $forceSecure = null ) { global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain; global $wgCookieSecure, $wgCookieExpiration, $wgCookieHttpOnly; - if ( $expire == 0 ) { + if ( $expire == 0 && $wgCookieExpiration != 0 ) { $expire = time() + $wgCookieExpiration; } if ( $prefix === null ) { -- 2.20.1