summaryrefslogtreecommitdiffstats
path: root/wp-settings.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-12 09:17:44 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-09-12 09:17:44 +0000
commit5aa6ad6448578b22f8f1b10b88df9083f965868b (patch)
tree6b3be2acbf307e7ea262f6d9d3381bdda46a9a28 /wp-settings.php
parent91c2d227e28206ec57d2b857822d90b11af256d3 (diff)
downloadwordpress-mu-5aa6ad6448578b22f8f1b10b88df9083f965868b.tar.gz
wordpress-mu-5aa6ad6448578b22f8f1b10b88df9083f965868b.tar.xz
wordpress-mu-5aa6ad6448578b22f8f1b10b88df9083f965868b.zip
Set the cookie path to the current site's path (fixes #125)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@737 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-settings.php')
-rw-r--r--wp-settings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-settings.php b/wp-settings.php
index c02e019..f91d822 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -227,9 +227,9 @@ if ( !defined('USER_COOKIE') )
if ( !defined('PASS_COOKIE') )
define('PASS_COOKIE', 'wordpresspass');
if ( !defined('COOKIEPATH') )
- define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) );
+ define('COOKIEPATH', $current_site->path );
if ( !defined('SITECOOKIEPATH') )
- define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) );
+ define('SITECOOKIEPATH', $current_site->path );
if ( !defined('COOKIE_DOMAIN') )
define('COOKIE_DOMAIN', '.' . $current_site->domain);