Changeset 35867

Timestamp:

12/11/2015 04:38:15 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Post Template: Pass the post ID to the_guid and get_the_guid filters.

Props danielbachhuber for initial patch.
Fixes #35015.

File:

• trunk/src/wp-includes/post-template.php (modified) (4 diffs)

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

@@ -170 +170 @@
  * @since 1.5.0
  *
- * @param int|WP_Post $id Optional. Post ID or post object.
- */
-function the_guid( $id = 0 ) {
+ * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
+ */
+function the_guid( $post = 0 ) {
+    $post = get_post( $post );
+
+    $guid = isset( $post->guid ) ? get_the_guid( $post ) : '';
+    $id   = isset( $post->ID ) ? $post->ID : 0;
+
     /**
      * Filter the escaped Global Unique Identifier (guid) of the post.
@@ -180 +185 @@
      * @see get_the_guid()
      *
-     * @param string $post_guid Escaped Global Unique Identifier (guid) of the post.
+     * @param string $guid Escaped Global Unique Identifier (guid) of the post.
+     * @param int    $id   The post ID.
      */
-    echo apply_filters( 'the_guid', get_the_guid( $id ) );
+    echo apply_filters( 'the_guid', $guid, $id );
 }
 
@@ -194 +200 @@
  * @since 1.5.0
  *
- * @param int|WP_Post $id Optional. Post ID or post object.
+ * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
-function get_the_guid( $id = 0 ) {
-    $post = get_post($id);
+function get_the_guid( $post = 0 ) {
+    $post = get_post( $post );
+
+    $guid = isset( $post->guid ) ? $post->guid : '';
+    $id   = isset( $post->ID ) ? $post->ID : 0;
 
     /**
@@ -205 +214 @@
      * @since 1.5.0
      *
-     * @param string $post_guid Global Unique Identifier (guid) of the post.
+     * @param string $guid Global Unique Identifier (guid) of the post.
+     * @param int    $id   The post ID.
      */
-    return apply_filters( 'get_the_guid', $post->guid );
+    return apply_filters( 'get_the_guid', $guid, $id );
 }