Changeset 10246

Timestamp:

12/23/2008 12:52:37 PM (17 years ago)

Author:

ryan

Message:

Allow overriding cat walker. Props AaronCampbell. fixes #8682 for trunk

Location:

trunk

Files:

• wp-admin/includes/template.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (2 diffs)

trunk/wp-admin/includes/template.php

@@ -440 +440 @@
  * @param unknown_type $popular_cats
  */
-function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false ) {
-    $walker = new Walker_Category_Checklist;
+function wp_category_checklist( $post_id = 0, $descendants_and_self = 0, $selected_cats = false, $popular_cats = false, $walker = null ) {
+    if ( empty($walker) || !is_a($walker, 'Walker') )
+        $walker = new Walker_Category_Checklist;
+
     $descendants_and_self = (int) $descendants_and_self;
 

trunk/wp-includes/category-template.php

@@ -720 +720 @@
  */
 function walk_category_tree() {
-    $walker = new Walker_Category;
     $args = func_get_args();
+    // the user's options are the third parameter
+    if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
+        $walker = new Walker_Category;
+    else
+        $walker = $args[2]['walker'];
+
     return call_user_func_array(array( &$walker, 'walk' ), $args );
 }
@@ -733 +738 @@
  */
 function walk_category_dropdown_tree() {
-    $walker = new Walker_CategoryDropdown;
     $args = func_get_args();
+    // the user's options are the third parameter
+    if ( empty($args[2]['walker']) || !is_a($args[2]['walker'], 'Walker') )
+        $walker = new Walker_CategoryDropdown;
+    else
+        $walker = $args[2]['walker'];
+
     return call_user_func_array(array( &$walker, 'walk' ), $args );
 }