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

Handle ports for canonical redirects. Props driverkt and westi. fixes #4970 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6112 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-09-13 19:24:05 +00:00
parent 9ea001d704
commit 3d3846ee8a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wp-includes/canonical.php
View File

@ -105,6 +105,12 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) {
$user_home = @parse_url(get_option('home'));
$redirect['host'] = $user_home['host'];
// Handle ports
if ( isset($user_home['port']) )
$redirect['port'] = $user_home['port'];
else
unset($redirect['port']);
// trailing /index.php or /index.php/
$redirect['path'] = preg_replace('|/index.php/?$|', '/', $redirect['path']);
@ -136,8 +142,11 @@ function redirect_canonical($requested_url=NULL, $do_redirect=true) {
if ( strtolower($original['host']) == strtolower($redirect['host']) )
$redirect['host'] = $original['host'];
if ( array($original['host'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['path'], $redirect['query']) ) {
$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
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']) )
$redirect_url .= ':' . $redirect['port'];
$redirect_url .= $redirect['path'];
if ( $redirect['query'] )
$redirect_url .= '?' . $redirect['query'];
}