Ticket #52814: 52814.diff

link-template.php

@@ -723 +723 @@
          * @param string $output The feed permalink.
          * @param string $feed   The feed type. Possible values include 'rss2', 'atom',
          *                       or an empty string for the default feed type.
          */
         return apply_filters( 'feed_link', $output, $feed );
 }
 
 /**
  * Retrieves the permalink for the post comments feed.
  *
  * @since 2.2.0
  *
  * @param int    $post_id Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $feed    Optional. Feed type. Possible values include 'rss2', 'atom'.
  *                        Default is the value of get_default_feed().
- * @return string The permalink for the comments feed for the given post.
+ * @return string|false The permalink for the comments feed for the given post.
  */
 function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
         $post_id = absint( $post_id );
 
         if ( ! $post_id ) {
                 $post_id = get_the_ID();
         }
 
         if ( empty( $feed ) ) {
                 $feed = get_default_feed();
         }
 
-        $post       = get_post( $post_id );
+        $post = get_post( $post_id );
+        if ( ! $post ) {
+                return false;
+        }
+
         $unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
         if ( get_option( 'permalink_structure' ) ) {
                 if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post_id ) {
                         $url = _get_page_link( $post_id );
                 } else {
                         $url = get_permalink( $post_id );
                 }
 
                 if ( $unattached ) {
                         $url = home_url( '/feed/' );
                         if ( get_default_feed() !== $feed ) {
                                 $url .= "$feed/";
                         }
                         $url = add_query_arg( 'attachment_id', $post_id, $url );