Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

Canonicalisation of the Taxonomy urls. Redirect /category/child/ to /category/parent/child/. Fix striping of slashes to use $redirect instead of $original. See #8948

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13091 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-13 06:17:59 +00:00
parent c8c6e1e6d7
commit 2741e81149
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
wp-includes/canonical.php
View File

@ -139,6 +139,21 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
$redirect['query'] = remove_query_arg('author', $redirect['query']); $redirect['query'] = remove_query_arg('author', $redirect['query']);
} }
// redirect sub-terms of taxonomies to their correct urls
if ( is_category() || is_tax() ) {
if ( is_category() ) {
$taxonomy = 'category';
$slug = get_query_var('category_name');
} else {
$taxonomy = get_query_var('taxonomy');
$slug = get_query_var('term');
}
if ( $tax_url = get_term_link($slug, $taxonomy) ) {
$tax_url = parse_url($tax_url);
$redirect['path'] = $tax_url['path'];
}
}
// paging and feeds // paging and feeds
if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) { if ( get_query_var('paged') || is_feed() || get_query_var('cpage') ) {
if ( !$redirect_url ) if ( !$redirect_url )
@ -257,7 +272,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
// Strip multiple slashes out of the URL // Strip multiple slashes out of the URL
if ( strpos($original['path'], '//') > -1 ) if ( strpos($original['path'], '//') > -1 )
$redirect['path'] = preg_replace('|/+|', '/', $original['path']); $redirect['path'] = preg_replace('|/+|', '/', $redirect['path']);
// Always trailing slash the Front Page URL // Always trailing slash the Front Page URL
if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) ) if ( trailingslashit( $redirect['path'] ) == trailingslashit( $user_home['path'] ) )