Changeset 16334

Timestamp:

11/12/2010 09:53:15 PM (16 years ago)

Author:

westi

Message:

Revert most of [16332] - renaming and deprecating a commonly used function is silly. Improving it is good. Fixes #15407.

Location:

trunk

Files:

• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-content/themes/twentyten/loop.php (modified) (1 diff)
• wp-includes/category-template.php (modified) (3 diffs)
• wp-includes/deprecated.php (modified) (4 diffs)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)

trunk/wp-admin/includes/class-wp-posts-list-table.php

@@ -597 +597 @@
                         ?>
                         <td <?php echo $attributes ?>><?php
-                                $categories = get_the_categories();
+                                $categories = get_the_category();
                                 if ( !empty( $categories ) ) {
                                         $out = array();

trunk/wp-content/themes/twentyten/loop.php

@@ -142 +142 @@
 
                         <div class="entry-utility">
-                                <?php if ( count( get_the_categories() ) ) : ?>
+                                <?php if ( count( get_the_category() ) ) : ?>
                                         <span class="cat-links">
                                                 <?php printf( __( '<span class="%1$s">Posted in</span> %2$s', 'twentyten' ), 'entry-utility-prep entry-utility-prep-cat-links', get_the_category_list( ', ' ) ); ?>

trunk/wp-includes/category-template.php

@@ -58 +58 @@
  * 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' );
 
@@ -69 +70 @@
                 _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 );
 }
@@ -140 +141 @@
 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 );

trunk/wp-includes/deprecated.php

@@ -73 +73 @@
  * @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
@@ -80 +80 @@
  */
 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;
 
@@ -109 +109 @@
 
         // Grab the first cat in the list.
-        $categories = get_the_categories();
+        $categories = get_the_category();
         $currentcat = $categories[0]->category_id;
         if ( $currentcat != $previouscat ) {
@@ -2557 +2557 @@
         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 );
-}

trunk/wp-includes/feed.php

@@ -300 +300 @@
         if ( empty($type) )
                 $type = get_default_feed();
-        $categories = get_the_categories();
+        $categories = get_the_category();
         $tags = get_the_tags();
         $the_list = '';

trunk/wp-includes/link-template.php

@@ -120 +120 @@
                 $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

trunk/wp-includes/post-template.php

@@ -350 +350 @@
         // 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;