http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94211
Revision: 94211
Author: demon
Date: 2011-08-10 23:27:10 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Allow overriding $wgCookiePrefix and $wgCookieDomain in
WebResponse::setcookie() so I can stop crying when I look at things like
CentralAuth and CentralNotice
Modified Paths:
--------------
trunk/phase3/includes/WebResponse.php
Modified: trunk/phase3/includes/WebResponse.php
===================================================================
--- trunk/phase3/includes/WebResponse.php 2011-08-10 22:50:30 UTC (rev
94210)
+++ trunk/phase3/includes/WebResponse.php 2011-08-10 23:27:10 UTC (rev
94211)
@@ -43,29 +43,37 @@
* @param $name String: name of cookie
* @param $value String: value to give cookie
* @param $expire Int: number of seconds til cookie expires
+ * @param $prefix String: Prefix to use, if not $wgCookiePrefix (use ''
for no prefix)
+ * @param @domain String: Cookie domain to use, if not $wgCookieDomain
*/
- public function setcookie( $name, $value, $expire = 0 ) {
+ public function setcookie( $name, $value, $expire = 0, $prefix = null,
$domain = null ) {
global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
global $wgCookieSecure,$wgCookieExpiration, $wgCookieHttpOnly;
if ( $expire == 0 ) {
$expire = time() + $wgCookieExpiration;
}
+ if( $prefix === null ) {
+ $prefix = $wgCookiePrefix;
+ }
+ if( $domain === null ) {
+ $domain = $wgCookieDomain;
+ }
$httpOnlySafe = wfHttpOnlySafe() && $wgCookieHttpOnly;
wfDebugLog( 'cookie',
'setcookie: "' . implode( '", "',
array(
- $wgCookiePrefix . $name,
+ $prefix . $name,
$value,
$expire,
$wgCookiePath,
- $wgCookieDomain,
+ $domain,
$wgCookieSecure,
$httpOnlySafe ) ) . '"' );
- setcookie( $wgCookiePrefix . $name,
+ setcookie( $prefix . $name,
$value,
$expire,
$wgCookiePath,
- $wgCookieDomain,
+ $domain,
$wgCookieSecure,
$httpOnlySafe );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
