From 3368e6b8e523ba562e38e6a192b2a6c16e1a2078 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 2 Nov 2008 20:53:15 +0000 Subject: [PATCH] Warning fixes git-svn-id: http://svn.automattic.com/wordpress/trunk@9475 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/canonical.php | 2 +- wp-includes/category-template.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 7acf63c942..69bee7d529 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -165,7 +165,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { } // tack on any additional query vars - if ( $redirect_url && $redirect['query'] ) { + if ( $redirect_url && !empty($redirect['query']) ) { if ( strpos($redirect_url, '?') !== false ) $redirect_url .= '&'; else diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 9f5031a507..1346f43fe8 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -62,7 +62,7 @@ function get_category_link( $category_id ) { return $category; $category_nicename = $category->slug; - if ( $parent == $category_id ) // recursive recursion + if ( $category->parent == $category_id ) // recursive recursion $category->parent = 0; if ( $parent = $category->parent )