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

Always trailingslash the "home" URL. Protect against chained redirects. Thanks wantmoore. fixes #4773 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6085 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2007-09-11 21:21:40 +00:00
parent ca4ddf50f8
commit 4bc7869c84
1 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
wp-includes/canonical.php
View File

@ -1,16 +1,18 @@
<?php <?php
// Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference" by Mark Jaquith // Based on "Permalink Redirect" from Scott Yang and "Enforce www. Preference" by Mark Jaquith
function redirect_canonical() { function redirect_canonical($requested_url=NULL, $do_redirect=true) {
global $wp_rewrite, $posts, $is_IIS; global $wp_rewrite, $posts, $is_IIS;
if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) ) if ( is_feed() || is_trackback() || is_search() || is_comments_popup() || is_admin() || $is_IIS || ( isset($_POST) && count($_POST) ) )
return; return;
// build the URL in the address bar if ( !$requested_url ) {
$requested_url = ( isset($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://'; // build the URL in the address bar
$requested_url .= $_SERVER['HTTP_HOST']; $requested_url = ( isset($_SERVER['HTTPS'] ) && strtolower($_SERVER['HTTPS']) == 'on' ) ? 'https://' : 'http://';
$requested_url .= $_SERVER['REQUEST_URI']; $requested_url .= $_SERVER['HTTP_HOST'];
$requested_url .= $_SERVER['REQUEST_URI'];
}
$original = @parse_url($requested_url); $original = @parse_url($requested_url);
if ( false === $original ) if ( false === $original )
@ -126,6 +128,10 @@ if ( $redirect_url )
$redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type); $redirect['path'] = user_trailingslashit($redirect['path'], $user_ts_type);
} }
// Always trailing slash the 'home' URL
if ( $redirect['path'] == $user_home['path'] )
$redirect['path'] = trailingslashit($redirect['path']);
if ( array($original['host'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['path'], $redirect['query']) ) { if ( array($original['host'], $original['path'], $original['query']) !== array($redirect['host'], $redirect['path'], $redirect['query']) ) {
$redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path']; $redirect_url = $redirect['scheme'] . '://' . $redirect['host'] . $redirect['path'];
if ( $redirect['query'] ) if ( $redirect['query'] )
@ -135,8 +141,19 @@ if ( $redirect_url )
if ( $redirect_url && $redirect_url != $requested_url ) { if ( $redirect_url && $redirect_url != $requested_url ) {
// var_dump($redirect_url); die(); // var_dump($redirect_url); die();
$redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url); $redirect_url = apply_filters('redirect_canonical', $redirect_url, $requested_url);
wp_redirect($redirect_url, 301); if ( $do_redirect) {
exit(); // protect against chained redirects
if ( !redirect_canonical($redirect_url, false) ) {
wp_redirect($redirect_url, 301);
exit();
} else {
return false;
}
} else {
return $redirect_url;
}
} else {
return false;
} }
} }