diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-24 17:20:16 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-12-24 17:20:16 +0000 |
| commit | 8fc094b4471e50f335abaed758a5f3eab06e5ce4 (patch) | |
| tree | 3c2202ce3e613e055cc2f53c35d84da2e804ad6b | |
| parent | 8dc73ef96fafb71db46103d0c07d5429416549be (diff) | |
| download | wordpress-mu-8fc094b4471e50f335abaed758a5f3eab06e5ce4.tar.gz wordpress-mu-8fc094b4471e50f335abaed758a5f3eab06e5ce4.tar.xz wordpress-mu-8fc094b4471e50f335abaed758a5f3eab06e5ce4.zip | |
Cookie fix
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@486 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-inst/wp-settings.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-inst/wp-settings.php b/wp-inst/wp-settings.php index 987b034..0c4a59b 100644 --- a/wp-inst/wp-settings.php +++ b/wp-inst/wp-settings.php @@ -295,7 +295,7 @@ if( $current_blog->spam == '1' ) { die( 'This blog has been archived or suspended.' ); } -/* + if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) : // Used to guarantee unique hash cookies $cookiehash = ''; // Remove in 1.4 @@ -312,7 +312,7 @@ if ( !defined('SITECOOKIEPATH') ) define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) ); if ( !defined('COOKIE_DOMAIN') ) define('COOKIE_DOMAIN', false); -*/ + require (ABSPATH . WPINC . '/vars.php'); |