golem
/
twentyGOLEM
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Siteurl autoupdate now requires RELOCATE flag - http://mosquito.wordpress.org/view.php?id=602 

git-svn-id: http://svn.automattic.com/wordpress/trunk@2130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
saxmatt 2005-01-24 07:30:49 +00:00
parent 25e08bf743
commit 99ea3245af
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wp-includes/functions.php
View File

@ -1629,15 +1629,15 @@ function add_magic_quotes($array) {
} }
function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '') { function wp_setcookie($username, $password, $already_md5 = false, $home = '', $siteurl = '') {
if ( ! $already_md5) if ( !$already_md5 )
$password = md5(md5($password)); // Double hash the password in the cookie. $password = md5( md5($password) ); // Double hash the password in the cookie.
if (empty($home)) if ( empty($home) )
$cookiepath = COOKIEPATH; $cookiepath = COOKIEPATH;
else else
$cookiepath = preg_replace('|https?://[^/]+|i', '', $home . '/' ); $cookiepath = preg_replace('|https?://[^/]+|i', '', $home . '/' );
if (empty($siteurl)) { if ( empty($siteurl) ) {
$sitecookiepath = SITECOOKIEPATH; $sitecookiepath = SITECOOKIEPATH;
$cookiehash = COOKIEHASH; $cookiehash = COOKIEHASH;
} else { } else {

13
wp-login.php
View File

@ -9,12 +9,13 @@ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-cache, must-revalidate'); header('Cache-Control: no-cache, must-revalidate');
header('Pragma: no-cache'); header('Pragma: no-cache');
// If someone has moved WordPress let's try to detect it if ( defined('RELOCATE') ) { // Move flag is set
if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) ) if ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != $_SERVER['PHP_SELF']) )
$_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] ); $_SERVER['PHP_SELF'] = str_replace( $_SERVER['PATH_INFO'], '', $_SERVER['PHP_SELF'] );
if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') ) if ( dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) != get_settings('siteurl') )
update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) ); update_option('siteurl', dirname('http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']) );
}
switch($action) { switch($action) {