From b793e1846fbe91b686fb0f4520998caa8e53c089 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 24 Feb 2008 02:09:24 +0000 Subject: [PATCH] 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 --- wp-includes/canonical.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index f6fbed8b4..5ad445750 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -178,12 +178,6 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { if ( strtolower($original['host']) == strtolower($redirect['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']) ) { $redirect_url = $redirect['scheme'] . '://' . $redirect['host']; if ( isset($redirect['port']) )