Changeset 21735 for trunk/wp-includes/category-template.php

Timestamp:

09/04/2012 04:29:28 PM (14 years ago)

Author:

ryan

Message:

Use get_post() instead of global $post.
Make the $post argument to get_post() optional, defaulting to the current post in The Loop.

Props nacin
see #21309

File:

• trunk/wp-includes/category-template.php (modified) (1 diff)

trunk/wp-includes/category-template.php

@@ -1055 +1055 @@
  * @since 2.5.0
  *
- * @param int $id Post ID.
+ * @param mixed $post Post ID or object.
  * @param string $taxonomy Taxonomy name.
  * @return array|bool False on failure. Array of term objects on success.
  */
-function get_the_terms( $id, $taxonomy ) {
-    global $post;
-
-    $id = (int) $id;
-
-    if ( !$id ) {
-        if ( empty( $post->ID ) )
-            return false;
-        else
-            $id = (int) $post->ID;
-    }
-
-    $terms = get_object_term_cache( $id, $taxonomy );
+function get_the_terms( $post, $taxonomy ) {
+    if ( ! $post = get_post( $post ) )
+        return false;
+
+    $terms = get_object_term_cache( $post->ID, $taxonomy );
     if ( false === $terms ) {
-        $terms = wp_get_object_terms( $id, $taxonomy );
-        wp_cache_add($id, $terms, $taxonomy . '_relationships');
-    }
-
-    $terms = apply_filters( 'get_the_terms', $terms, $id, $taxonomy );
+        $terms = wp_get_object_terms( $post->ID, $taxonomy );
+        wp_cache_add($post->ID, $terms, $taxonomy . '_relationships');
+    }
+
+    $terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
 
     if ( empty( $terms ) )