Changeset 34336 for trunk/src/wp-includes/link-template.php

Timestamp:

09/19/2015 08:09:05 PM (11 years ago)

Author:

wonderboymusic

Message:

Feeds/Links: fix feed links for unattached attachments.

Adds unit tests.

Props wonderboymusic, iworks.
Fixes #33693.

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

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

@@ -623 +623 @@
                 $feed = get_default_feed();
 
+        $post = get_post( $post_id );
+        $unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
+
         if ( '' != get_option('permalink_structure') ) {
                 if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
@@ -629 +632 @@
                         $url = get_permalink($post_id);
 
-                $url = trailingslashit($url) . 'feed';
-                if ( $feed != get_default_feed() )
-                        $url .= "/$feed";
-                $url = user_trailingslashit($url, 'single_feed');
+                if ( $unattached ) {
+                        $url =  home_url( '/feed/' );
+                        if ( $feed !== get_default_feed() ) {
+                                $url .= "$feed/";
+                        }
+                        $url = add_query_arg( 'attachment_id', $post_id, $url );
+                } else {
+                        $url = trailingslashit($url) . 'feed';
+                        if ( $feed != get_default_feed() )
+                                $url .= "/$feed";
+                        $url = user_trailingslashit($url, 'single_feed');
+                }
         } else {
-                $type = get_post_field('post_type', $post_id);
-                if ( 'page' == $type )
+                if ( $unattached ) {
+                        $url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
+                } elseif ( 'page' == $post->post_type ) {
                         $url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
-                else
+                } else {
                         $url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+                }
         }