Changeset 41221

Timestamp:

08/03/2017 04:12:25 PM (7 years ago)

Author:

johnbillion

Message:

General: Fix more instances of inconsistent parameters passed to various filters, plus fix some filter docs.

See #38462, #41017

Location:

trunk/src

Files:

• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/includes/class-walker-category-checklist.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-includes/category-template.php (modified) (3 diffs)

trunk/src/wp-admin/edit-tags.php

@@ -545 +545 @@
         __( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
         /** This filter is documented in wp-includes/category-template.php */
-        '<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
+        '<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ), '', '' ) . '</strong>'
     );
     ?>

trunk/src/wp-admin/includes/class-walker-category-checklist.php

@@ -97 +97 @@
                 '<div class="' . $inner_class . '" data-term-id=' . $category->term_id .
                 ' tabindex="0" role="checkbox" aria-checked="' . $aria_checked . '">' .
-                esc_html( apply_filters( 'the_category', $category->name ) ) . '</div>';
+                esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</div>';
         } else {
             /** This filter is documented in wp-includes/category-template.php */
@@ -104 +104 @@
                 checked( in_array( $category->term_id, $args['selected_cats'] ), true, false ) .
                 disabled( empty( $args['disabled'] ), false, false ) . ' /> ' .
-                esc_html( apply_filters( 'the_category', $category->name ) ) . '</label>';
+                esc_html( apply_filters( 'the_category', $category->name, '', '' ) ) . '</label>';
         }
     }

trunk/src/wp-admin/includes/template.php

@@ -215 +215 @@
                 <?php
                 /** This filter is documented in wp-includes/category-template.php */
-                echo esc_html( apply_filters( 'the_category', $term->name ) );
+                echo esc_html( apply_filters( 'the_category', $term->name, '', '' ) );
                 ?>
             </label>
@@ -256 +256 @@
 
         /** This filter is documented in wp-includes/category-template.php */
-        $name = esc_html( apply_filters( 'the_category', $category->name ) );
+        $name = esc_html( apply_filters( 'the_category', $category->name, '', '' ) );
         $checked = in_array( $cat_id, $checked_categories ) ? ' checked="checked"' : '';
         echo '<li id="link-category-', $cat_id, '"><label for="in-link-category-', $cat_id, '" class="selectit"><input value="', $cat_id, '" type="checkbox" name="link_category[]" id="in-link-category-', $cat_id, '"', $checked, '/> ', $name, "</label></li>";

trunk/src/wp-includes/category-template.php

@@ -387 +387 @@
          * @see wp_dropdown_categories()
          *
-         * @param string $element Taxonomy element to list.
+         * @param string       $element  Category name.
+         * @param WP_Term|null $category The category object, or null if there's no corresponding category.
          */
-        $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
+        $show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
         $output .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
     }
@@ -398 +399 @@
 
             /** This filter is documented in wp-includes/category-template.php */
-            $show_option_all = apply_filters( 'list_cats', $r['show_option_all'] );
+            $show_option_all = apply_filters( 'list_cats', $r['show_option_all'], null );
             $selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
             $output .= "\t<option value='0'$selected>$show_option_all</option>\n";
@@ -406 +407 @@
 
             /** This filter is documented in wp-includes/category-template.php */
-            $show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
+            $show_option_none = apply_filters( 'list_cats', $r['show_option_none'], null );
             $selected = selected( $option_none_value, $r['selected'], false );
             $output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";