WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert changes to canonical that broke redirects. Props fitztrev. fixes #5961 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-02-24 02:09:24 +00:00
parent 1e2c4818e8
commit b793e1846f
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/canonical.php
View File

@ -178,12 +178,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
if ( strtolower($original['host']) == strtolower($redirect['host']) ) if ( strtolower($original['host']) == strtolower($redirect['host']) )
$redirect['host'] = $original['host']; $redirect['host'] = $original['host'];
// prevent notices in the comparison below
$original['query'] = isset($redirect['query'])? $redirect['query'] : false;
$original['port'] = isset($redirect['port'])? $redirect['port'] : false;
$redirect['query'] = isset($redirect['query'])? $redirect['query'] : false;
$redirect['port'] = isset($redirect['port'])? $redirect['port'] : false;
if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) { if ( array($original['host'], $original['port'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['port'], $redirect['path'], $redirect['query']) ) {
$redirect_url = $redirect['scheme'] . '://' . $redirect['host']; $redirect_url = $redirect['scheme'] . '://' . $redirect['host'];
if ( isset($redirect['port']) ) if ( isset($redirect['port']) )