Changeset 2725

Timestamp:

07/18/2005 07:55:24 PM (19 years ago)

Author:

matt

Message:

Let advanced users override cookies.

Location:

trunk

Files:

• wp-includes/pluggable-functions.php (modified) (2 diffs)
• wp-includes/vars.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)

trunk/wp-includes/pluggable-functions.php

@@ -192 +192 @@
     }
 
-    setcookie('wordpressuser_'. $cookiehash, $username, time() + 31536000, $cookiepath);
-    setcookie('wordpresspass_'. $cookiehash, $password, time() + 31536000, $cookiepath);
+    setcookie(USER_COOKIE, $username, time() + 31536000, $cookiepath, COOKIE_DOMAIN);
+    setcookie(PASS_COOKIE, $password, time() + 31536000, $cookiepath, COOKIE_DOMAIN);
 
     if ( $cookiepath != $sitecookiepath ) {
-        setcookie('wordpressuser_'. $cookiehash, $username, time() + 31536000, $sitecookiepath);
-        setcookie('wordpresspass_'. $cookiehash, $password, time() + 31536000, $sitecookiepath);
+        setcookie(USER_COOKIE, $username, time() + 31536000, $sitecookiepath, COOKIE_DOMAIN);
+        setcookie(PASS_COOKIE, $password, time() + 31536000, $sitecookiepath, COOKIE_DOMAIN);
     }
 }
@@ -204 +204 @@
 if ( !function_exists('wp_clearcookie') ) :
 function wp_clearcookie() {
-    setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
-    setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, COOKIEPATH);
-    setcookie('wordpressuser_' . COOKIEHASH, ' ', time() - 31536000, SITECOOKIEPATH);
-    setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, SITECOOKIEPATH);
+    setcookie(USER_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie(PASS_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN);
+    setcookie(USER_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN);
+    setcookie(PASS_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN);
 }
 endif;

trunk/wp-includes/vars.php

@@ -107 +107 @@
 }
 
-// Path for cookies
-define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
-define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('siteurl') . '/' ) );
-
 ?>

trunk/wp-settings.php

@@ -57 +57 @@
 if ( defined('CUSTOM_USER_META_TABLE') )
     $wpdb->usermeta = CUSTOM_USER_META_TABLE;
-
+    
 // We're going to need to keep this around for a few months even though we're not using it internally
 
@@ -104 +104 @@
     define('COOKIEHASH', $cookiehash); 
 endif;
+
+if ( !defined('USER_COOKIE') )
+    define('USER_COOKIE', 'wordpressuser_'. COOKIEHASH);
+if ( !defined('PASS_COOKIE') )
+    define('PASS_COOKIE', 'wordpresspass_'. COOKIEHASH);
+if ( !defined('COOKIEPATH') )
+    define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_settings('home') . '/' ) );
+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');