From 435c4c2dbf693e52e2d5b11a28bd4cef4dc34045 Mon Sep 17 00:00:00 2001 From: westi Date: Fri, 12 Nov 2010 21:53:15 +0000 Subject: [PATCH] Revert most of [16332] - renaming and deprecating a commonly used function is silly. Improving it is good. Fixes #15407. git-svn-id: http://svn.automattic.com/wordpress/trunk@16334 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../includes/class-wp-posts-list-table.php | 2 +- wp-content/themes/twentyten/loop.php | 2 +- wp-includes/category-template.php | 9 ++++--- wp-includes/deprecated.php | 26 ++++--------------- wp-includes/feed.php | 2 +- wp-includes/link-template.php | 2 +- wp-includes/post-template.php | 2 +- 7 files changed, 15 insertions(+), 30 deletions(-) diff --git a/wp-admin/includes/class-wp-posts-list-table.php b/wp-admin/includes/class-wp-posts-list-table.php index 4f1f62b35b..dea8f65409 100644 --- a/wp-admin/includes/class-wp-posts-list-table.php +++ b/wp-admin/includes/class-wp-posts-list-table.php @@ -596,7 +596,7 @@ class WP_Posts_List_Table extends WP_List_Table { case 'categories': ?> >
- + Posted in %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?> diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php index 173183c324..d01231df99 100644 --- a/wp-includes/category-template.php +++ b/wp-includes/category-template.php @@ -57,18 +57,19 @@ function get_category_parents( $id, $link = false, $separator = '/', $nicename = /** * Retrieve post categories. * - * @since 3.1 + * @since 0.71 + * @uses $post * * @param int $id Optional, default to current post ID. The post ID. * @return array */ -function get_the_categories( $id = false ) { +function get_the_category( $id = false ) { $categories = get_the_terms( $id, 'category' ); foreach ( (array) array_keys( $categories ) as $key ) { _make_cat_compat( $categories[$key] ); } - + // Filter name is plural because we are return alot of categories not just one return apply_filters( 'get_the_categories', $categories ); } @@ -139,7 +140,7 @@ function get_the_category_by_ID( $cat_ID ) { */ function get_the_category_list( $separator = '', $parents='', $post_id = false ) { global $wp_rewrite; - $categories = get_the_categories( $post_id ); + $categories = get_the_category( $post_id ); if ( !is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) ) return apply_filters( 'the_category', '', $separator, $parents ); diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index c56707b989..9775e827fa 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -72,17 +72,17 @@ function start_wp() { * * @since 0.71 * @deprecated 0.71 - * @deprecated use get_the_categories() - * @see get_the_categories() + * @deprecated use get_the_category() + * @see get_the_category() * * @param bool $echo * @return null|int */ function the_category_ID($echo = true) { - _deprecated_function( __FUNCTION__, '0.71', 'get_the_categories()' ); + _deprecated_function( __FUNCTION__, '0.71', 'get_the_category()' ); // Grab the first cat in the list. - $categories = get_the_categories(); + $categories = get_the_category(); $cat = $categories[0]->term_id; if ( $echo ) @@ -108,7 +108,7 @@ function the_category_head($before='', $after='') { _deprecated_function( __FUNCTION__, '0.71', 'get_the_category_by_ID()' ); // Grab the first cat in the list. - $categories = get_the_categories(); + $categories = get_the_category(); $currentcat = $categories[0]->category_id; if ( $currentcat != $previouscat ) { echo $before; @@ -2556,19 +2556,3 @@ function is_plugin_page() { return false; } - -/** - * Retrieve post categories. - * - * @since 0.71 - * @uses $post - * @deprecated 3.1 - * @deprecated Use get_post_categories() instead. - * - * @param int $id Optional, default to current post ID. The post ID. - * @return array - */ -function get_the_category( $id = false ) { - _deprecated_function( __FUNCTION__, '3.1', 'get_the_categories()' ); - return get_the_categories( $id ); -} diff --git a/wp-includes/feed.php b/wp-includes/feed.php index 2bbf20f136..3ed2191787 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -299,7 +299,7 @@ function comment_text_rss() { function get_the_category_rss($type = null) { if ( empty($type) ) $type = get_default_feed(); - $categories = get_the_categories(); + $categories = get_the_category(); $tags = get_the_tags(); $the_list = ''; $cat_names = array(); diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 76a54a09ce..cfcdfd2abc 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -119,7 +119,7 @@ function get_permalink($id = 0, $leavename = false) { $category = ''; if ( strpos($permalink, '%category%') !== false ) { - $cats = get_the_categories($post->ID); + $cats = get_the_category($post->ID); if ( $cats ) { usort($cats, '_usort_terms_by_ID'); // order by ID $category = $cats[0]->slug; diff --git a/wp-includes/post-template.php b/wp-includes/post-template.php index b76d0b693a..0b1db1a1bf 100644 --- a/wp-includes/post-template.php +++ b/wp-includes/post-template.php @@ -349,7 +349,7 @@ function get_post_class( $class = '', $post_id = null ) { // Categories if ( is_object_in_taxonomy( $post->post_type, 'category' ) ) { - foreach ( (array) get_the_categories($post->ID) as $cat ) { + foreach ( (array) get_the_category($post->ID) as $cat ) { if ( empty($cat->slug ) ) continue; $classes[] = 'category-' . sanitize_html_class($cat->slug, $cat->term_id);