Warning fixes
git-svn-id: http://svn.automattic.com/wordpress/trunk@9475 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
cf1bff865a
commit
3368e6b8e5
|
@ -165,7 +165,7 @@ function redirect_canonical($requested_url=null, $do_redirect=true) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// tack on any additional query vars
|
// tack on any additional query vars
|
||||||
if ( $redirect_url && $redirect['query'] ) {
|
if ( $redirect_url && !empty($redirect['query']) ) {
|
||||||
if ( strpos($redirect_url, '?') !== false )
|
if ( strpos($redirect_url, '?') !== false )
|
||||||
$redirect_url .= '&';
|
$redirect_url .= '&';
|
||||||
else
|
else
|
||||||
|
|
|
@ -62,7 +62,7 @@ function get_category_link( $category_id ) {
|
||||||
return $category;
|
return $category;
|
||||||
$category_nicename = $category->slug;
|
$category_nicename = $category->slug;
|
||||||
|
|
||||||
if ( $parent == $category_id ) // recursive recursion
|
if ( $category->parent == $category_id ) // recursive recursion
|
||||||
$category->parent = 0;
|
$category->parent = 0;
|
||||||
|
|
||||||
if ( $parent = $category->parent )
|
if ( $parent = $category->parent )
|
||||||
|
|
Loading…
Reference in New Issue