Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow $wgCookiePrefix to be set by the user. Default is false which keeps current behavior in Setup. Fixes bug 14843.

Browse source
This commit is contained in:
Chad Horohoe 2008-07-21 21:51:51 +00:00
parent 050e1c7380
commit 0775a89d73
3 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -68,6 +68,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
with MimeMagic.
* Added $wgDirectoryMode, which allows for setting the default CHMOD value when
creating new directories.
* (bug 14843) $wgCookiePrefix can be set by LocalSettings now, false defaults
current behavior.
=== New features in 1.13 ===

6
includes/DefaultSettings.php
View file

@ -1527,6 +1527,12 @@ $wgCookiePath = '/';
$wgCookieSecure = ($wgProto == 'https');
$wgDisableCookieCheck = false;
/**
* Set $wgCookiePrefix to use a custom one. Setting to false sets the default of
* using the database name.
*/
$wgCookiePrefix = false;
/**
* Set authentication cookies to HttpOnly to prevent access by JavaScript,
* in browsers that support this feature. This can mitigates some classes of

18
includes/Setup.php
View file

@ -204,14 +204,16 @@ wfProfileIn( $fname.'-SetupSession' );
# Set default shared prefix
if( $wgSharedPrefix === false ) $wgSharedPrefix = $wgDBprefix;
if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
} elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
$wgCookiePrefix = $wgSharedDB;
} elseif ( $wgDBprefix ) {
$wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
} else {
$wgCookiePrefix = $wgDBname;
if( !$wgCookiePrefix ) {
if ( in_array('user', $wgSharedTables) && $wgSharedDB && $wgSharedPrefix ) {
$wgCookiePrefix = $wgSharedDB . '_' . $wgSharedPrefix;
} elseif ( in_array('user', $wgSharedTables) && $wgSharedDB ) {
$wgCookiePrefix = $wgSharedDB;
} elseif ( $wgDBprefix ) {
$wgCookiePrefix = $wgDBname . '_' . $wgDBprefix;
} else {
$wgCookiePrefix = $wgDBname;
}
}
$wgCookiePrefix = strtr($wgCookiePrefix, "=,; +.\"'\\[", "__________");