summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/pluggable-functions.php
diff options
context:
space:
mode:
authormatt <matt@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 20:02:27 +0000
committermatt <matt@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-07-18 20:02:27 +0000
commit987d9d09b813bf26661ea0735f2c9d4ec5cedd23 (patch)
tree82fd35159670438aefa23a29a06b5de8793cadc9 /wp-inst/wp-includes/pluggable-functions.php
parente1b146152422500f8f99eacaa06f71422e3202ba (diff)
downloadwordpress-mu-987d9d09b813bf26661ea0735f2c9d4ec5cedd23.tar.gz
wordpress-mu-987d9d09b813bf26661ea0735f2c9d4ec5cedd23.tar.xz
wordpress-mu-987d9d09b813bf26661ea0735f2c9d4ec5cedd23.zip
Porting changes from WP
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@42 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/pluggable-functions.php')
-rw-r--r--wp-inst/wp-includes/pluggable-functions.php16
1 files changed, 8 insertions, 8 deletions
diff --git a/wp-inst/wp-includes/pluggable-functions.php b/wp-inst/wp-includes/pluggable-functions.php
index c32f852..b76b263 100644
--- a/wp-inst/wp-includes/pluggable-functions.php
+++ b/wp-inst/wp-includes/pluggable-functions.php
@@ -191,22 +191,22 @@ function wp_setcookie($username, $password, $already_md5 = false, $home = '', $s
$cookiehash = md5($siteurl);
}
- 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);
}
}
endif;
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;