Changeset 737

Show
Ignore:
Timestamp:
09/12/06 09:17:44 (2 years ago)
Author:
donncha
Message:

Set the cookie path to the current site's path (fixes #125)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/pluggable.php

    r729 r737  
    295295                $password = md5( md5($password) ); // Double hash the password in the cookie. 
    296296 
    297         if ( empty($home) ) 
    298                 $cookiepath = COOKIEPATH; 
    299         else 
    300                 $cookiepath = preg_replace('|https?://[^/]+|i', '', $home . '/' ); 
    301  
    302         if ( empty($siteurl) ) { 
    303                 $sitecookiepath = SITECOOKIEPATH; 
    304                 $cookiehash = COOKIEHASH; 
    305         } else { 
    306                 $sitecookiepath = preg_replace('|https?://[^/]+|i', '', $siteurl . '/' ); 
    307                 $cookiehash = md5($siteurl); 
    308         } 
    309  
    310297        if ( $remember ) 
    311298                $expire = time() + 31536000; 
    …… 
    313300                $expire = 0; 
    314301 
    315         setcookie(USER_COOKIE, $username, $expire, $cookiepath, COOKIE_DOMAIN); 
    316         setcookie(PASS_COOKIE, $password, $expire, $cookiepath, COOKIE_DOMAIN); 
    317  
    318         if ( $cookiepath != $sitecookiepath ) { 
    319                 setcookie(USER_COOKIE, $username, $expire, $sitecookiepath, COOKIE_DOMAIN); 
    320                 setcookie(PASS_COOKIE, $password, $expire, $sitecookiepath, COOKIE_DOMAIN); 
    321         } 
     302        global $base; 
     303        setcookie(USER_COOKIE, $username, $expire, $base, COOKIE_DOMAIN); 
     304        setcookie(PASS_COOKIE, $password, $expire, $base, COOKIE_DOMAIN); 
    322305} 
    323306endif; 
    …… 
    325308if ( !function_exists('wp_clearcookie') ) : 
    326309function wp_clearcookie() { 
    327         setcookie(USER_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); 
    328         setcookie(PASS_COOKIE, ' ', time() - 31536000, COOKIEPATH, COOKIE_DOMAIN); 
    329         setcookie(USER_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); 
    330         setcookie(PASS_COOKIE, ' ', time() - 31536000, SITECOOKIEPATH, COOKIE_DOMAIN); 
     310        global $base; 
     311        setcookie(USER_COOKIE, ' ', time() - 31536000, $base, COOKIE_DOMAIN); 
     312        setcookie(PASS_COOKIE, ' ', time() - 31536000, $base, COOKIE_DOMAIN); 
    331313} 
    332314endif; 

  • trunk/wp-settings.php

    r734 r737  
    228228        define('PASS_COOKIE', 'wordpresspass'); 
    229229if ( !defined('COOKIEPATH') ) 
    230         define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) ); 
     230        define('COOKIEPATH', $current_site->path ); 
    231231if ( !defined('SITECOOKIEPATH') ) 
    232         define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) ); 
     232        define('SITECOOKIEPATH', $current_site->path ); 
    233233if ( !defined('COOKIE_DOMAIN') ) 
    234234        define('COOKIE_DOMAIN', '.' . $current_site->domain);