diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-03 16:10:19 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-07-03 16:10:19 +0000 |
| commit | 102dc1d903d95fd7abdf2243d7e047b4b20099d3 (patch) | |
| tree | e5f1bf3d08f6c48ab1cf8d61c3b02a976e4f97bc /wp-settings.php | |
| parent | 9a3b52a00835411618a6ca1b3859c3121b836e8d (diff) | |
| download | wordpress-mu-102dc1d903d95fd7abdf2243d7e047b4b20099d3.tar.gz wordpress-mu-102dc1d903d95fd7abdf2243d7e047b4b20099d3.tar.xz wordpress-mu-102dc1d903d95fd7abdf2243d7e047b4b20099d3.zip | |
Set ADMIN_COOKIE_PATH to / for non VHOST installs, slightly less secure but fixes #677, props rboren
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1346 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
| -rw-r--r-- | wp-settings.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php index d37fb72..0f39503 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -404,8 +404,13 @@ if ( !defined('SITECOOKIEPATH') ) * It is possible to define this in wp-config.php * @since 2.6 */ -if ( !defined('ADMIN_COOKIE_PATH') ) - define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); +if ( !defined('ADMIN_COOKIE_PATH') ) { + if( constant( 'VHOST' ) == 'no' ) { + define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH ); + } else { + define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); + } +} /** * It is possible to define this in wp-config.php |