From 0db421e69b74a8d871c0e08d5a47ceb3bc1a0dbb Mon Sep 17 00:00:00 2001 From: Boone Gorges Date: Wed, 26 Aug 2015 19:43:24 +0000 Subject: [PATCH] After [33764], fix docblock formatting for `wp_list_categories()`. See #33460. Built from https://develop.svn.wordpress.org/trunk@33765 git-svn-id: http://core.svn.wordpress.org/trunk@33733 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/category-template.php | 57 ++++++++++++++++--------------- wp-includes/version.php | 2 +- 2 files changed, 30 insertions(+), 29 deletions(-) diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index fb789606f4..7fa5926eb7 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -466,36 +466,37 @@ function wp_dropdown_categories( $args = '' ) { * @param string|array $args { * Array of optional arguments. * - * @type string $show_option_all Text to display for showing all categories. Default empty string. - * @type string $show_option_none Text to display for the 'no categories' option. Default 'No categories'. - * @type string $orderby The column to use for ordering categories. Default 'ID'. - * @type string $order Which direction to order categories. Accepts 'ASC' or 'DESC'. - * Default 'ASC'. - * @type bool|int $show_count Whether to show how many posts are in the category. Default 0. - * @type bool|int $hide_empty Whether to hide categories that don't have any posts attached to them. - * Default 1. - * @type bool|int $use_desc_for_title Whether to use the category description as the title attribute. - * Default 1. - * @type string $feed Text to use for the feed link. Default 'Feed for all posts filed - * under [cat name]'. - * @type string $feed_type Feed type. Used to build feed link. See {@link get_term_feed_link()}. - * Default empty string (default feed). - * @type string $feed_image URL of an image to use for the feed link. Default empty string. - * @type int $child_of Term ID to retrieve child terms of. See {@link get_terms()}. Default 0. - * @type array|string $exclude Array or comma/space-separated string of term IDs to exclude. - * See {@link get_terms()}. Default empty string. - * @type array|string $exclude_tree Array or comma/space-separated string of term IDs to exclude, along with - * their descendants. See {@link get_terms()}. Default empty string. - * @type bool|int $echo True to echo markup, false to return it. Default 1. - * @type int $current_category Category that should get the 'current-cat' class. Default 0. - * @type bool $hierarchical Whether to include terms that have non-empty descendants. - * See {@link get_terms()}. Default true. - * @type string $title_li Text to use for the list title `
  • ` element. Pass an empty string - * to disable. Default 'Categories'. + * @type string $show_option_all Text to display for showing all categories. Default empty string. + * @type string $show_option_none Text to display for the 'no categories' option. + * Default 'No categories'. + * @type string $orderby The column to use for ordering categories. Default 'ID'. + * @type string $order Which direction to order categories. Accepts 'ASC' or 'DESC'. + * Default 'ASC'. + * @type bool|int $show_count Whether to show how many posts are in the category. Default 0. + * @type bool|int $hide_empty Whether to hide categories that don't have any posts attached to them. + * Default 1. + * @type bool|int $use_desc_for_title Whether to use the category description as the title attribute. + * Default 1. + * @type string $feed Text to use for the feed link. Default 'Feed for all posts filed + * under [cat name]'. + * @type string $feed_type Feed type. Used to build feed link. See {@link get_term_feed_link()}. + * Default empty string (default feed). + * @type string $feed_image URL of an image to use for the feed link. Default empty string. + * @type int $child_of Term ID to retrieve child terms of. See {@link get_terms()}. Default 0. + * @type array|string $exclude Array or comma/space-separated string of term IDs to exclude. + * See {@link get_terms()}. Default empty string. + * @type array|string $exclude_tree Array or comma/space-separated string of term IDs to exclude, along + * with their descendants. See {@link get_terms()}. Default empty string. + * @type bool|int $echo True to echo markup, false to return it. Default 1. + * @type int $current_category Category that should get the 'current-cat' class. Default 0. + * @type bool $hierarchical Whether to include terms that have non-empty descendants. + * See {@link get_terms()}. Default true. + * @type string $title_li Text to use for the list title `
  • ` element. Pass an empty string + * to disable. Default 'Categories'. * @type bool $hide_title_if_no_cats Whether to hide the `$title_li` element if there are no terms in * the list. Default false (title will always be shown). - * @type int $depth Category depth. Used for tab indentation. Default 0. - * @type string $taxonomy Taxonomy name. Default 'category'. + * @type int $depth Category depth. Used for tab indentation. Default 0. + * @type string $taxonomy Taxonomy name. Default 'category'. * } * @return false|string HTML content only if 'echo' argument is 0. */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 59f8f0e6d1..ede0b29b98 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-33764'; +$wp_version = '4.4-alpha-33765'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.