Changeset 4580

Timestamp:

12/01/2006 06:55:27 PM (18 years ago)

Author:

ryan

Message:

Avoid empty result category queries. Props andy. fixes #3416

Location:

trunk/wp-includes

Files:

• category-template.php (modified) (1 diff)
• classes.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -239 +239 @@
     } else {
         global $wp_query;
-        $r['current_category'] = $wp_query->get_queried_object_id();
+        
+        if ( is_category() )
+            $r['current_category'] = $wp_query->get_queried_object_id();
+
         if ( $hierarchical )
             $depth = 0;  // Walk the full depth.

trunk/wp-includes/classes.php

@@ -620 +620 @@
         }
 
-        $_current_category = get_category( $current_category );
+        if ( $current_category )
+            $_current_category = get_category( $current_category );
 
         if ( 'list' == $args['style'] ) {
             $output .= "\t<li";
-            if ( ($category->cat_ID == $current_category) && is_category() )
+            if ( $current_category && ($category->cat_ID == $current_category) )
                 $output .=  ' class="current-cat"';
-            elseif ( ($category->cat_ID == $_current_category->category_parent) && is_category() )
+            elseif ( $_current_category && ($category->cat_ID == $_current_category->category_parent) )
                 $output .=  ' class="current-cat-parent"';
             $output .= ">$link\n";