From b385071e768ab2fe837b98b969ed6e5695806d1c Mon Sep 17 00:00:00 2001 From: Dion Hulse Date: Sat, 6 Feb 2010 03:40:24 +0000 Subject: [PATCH] Redirect home_url variants to home_url(). See #11991 git-svn-id: https://develop.svn.wordpress.org/trunk@12979 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/canonical.php | 4 +++- wp-includes/link-template.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index af059f0db5..8d9b7b6286 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -100,6 +100,8 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) { if ( $redirect_url = get_permalink(get_query_var('page_id')) ) $redirect['query'] = remove_query_arg('page_id', $redirect['query']); + } elseif ( is_page() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front') && ! $redirect_url ) { + $redirect_url = home_url('/'); } elseif ( !empty($_GET['m']) && ( is_year() || is_month() || is_day() ) ) { $m = get_query_var('m'); switch ( strlen($m) ) { @@ -134,7 +136,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { $redirect['query'] = remove_query_arg('author', $redirect['query']); } - // paging and feeds + // paging and feeds if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) { if ( !$redirect_url ) $redirect_url = $requested_url; diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 73f78caabf..f64c6ccf43 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -234,7 +234,7 @@ function get_page_link( $id = false, $leavename = false, $sample = false ) { $id = (int) $post->ID; if ( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) - $link = home_url(); + $link = home_url('/'); else $link = _get_page_link( $id , $leavename, $sample );