Ticket #2934: 2934.patch

wp-includes/category.php

@@ -28 +28 @@
         $where = 'cat_ID > 0';
         $inclusions = '';
         if ( !empty($include) ) {
-                $child_of = 0; //ignore child_of and exclude params if using include 
-                $exclude = '';  
+                $child_of = 0; //ignore child_of and exclude params if using include
+                $exclude = '';
                 $incategories = preg_split('/[\s,]+/',$include);
                 if ( count($incategories) ) {
                         foreach ( $incategories as $incat ) {
@@ -40 +40 @@
                         }
                 }
         }
-        if (!empty($inclusions)) 
-                $inclusions .= ')';     
+        if (!empty($inclusions))
+                $inclusions .= ')';
         $where .= $inclusions;
 
         $exclusions = '';
@@ -57 +57 @@
                         }
                 }
         }
-        if (!empty($exclusions)) 
+        if (!empty($exclusions))
                 $exclusions .= ')';
-        $exclusions = apply_filters('list_cats_exclusions', $exclusions );
+        $exclusions = apply_filters('list_cats_exclusions', $exclusions, $r );
         $where .= $exclusions;
 
         $having = '';
@@ -85 +85 @@
                 function stamp_cat($cat) {
                         global $cat_stamps;
                         $cat->last_update_timestamp = $cat_stamps[$cat->cat_ID];
-                        return $cat;    
+                        return $cat;
                 }
                 $categories = array_map('stamp_cat', $categories);
                 unset($cat_stamps);
@@ -94 +94 @@
         if ( $child_of || $hierarchical )
                 $categories = & _get_cat_children($child_of, $categories);
 
-        return apply_filters('get_categories', $categories);
+        return apply_filters('get_categories', $categories, $r);
 }
 
 // Retrieves category data given a category ID or category object.
@@ -141 +141 @@
 
         $categories = $wpdb->get_results("SELECT cat_ID, category_nicename, category_parent FROM $wpdb->categories WHERE category_nicename = '$leaf_path'");
 
-        if ( empty($categories) ) 
+        if ( empty($categories) )
                 return NULL;
 
         foreach ($categories as $category) {