Changeset 48496

Timestamp:

07/16/2020 09:29:05 PM (4 years ago)

Author:

whyisjake

Message:

Feeds: Ensure that galleries can be output as a list of links in feeds.

Adjusts the gallery shortcode handler to check for the link attribute when outputting to a feed.

Fixes #22101.

Props ifrins, mdgl, SergeyBiryukov, chriscct7, stevenkword, iworks, DrewAPicture, birgire, whyisjake.

Location:

trunk

Files:

• src/wp-includes/media.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

trunk/src/wp-includes/media.php

@@ -2251 +2251 @@
         $output = "\n";
         foreach ( $attachments as $att_id => $attachment ) {
-            $output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+            if ( ! empty( $atts['link'] ) ) {
+                if ( 'none' === $atts['link'] ) {
+                    $output .= wp_get_attachment_image( $att_id, $atts['size'], false, $attr );
+                } else {
+                    $output .= wp_get_attachment_link( $att_id, $atts['size'], false );
+                }
+            } else {
+                $output .= wp_get_attachment_link( $att_id, $atts['size'], true );
+            }
+            $output .= "\n";
         }
         return $output;

trunk/tests/phpunit/tests/media.php

@@ -2947 +2947 @@
         $this->assertTrue( wp_image_file_matches_image_meta( $image_src, $image_meta ) );
     }
+
+        /**
+         * @ticket 22101
+         */
+    function test_gallery_shortcode_when_is_feed_true() {
+
+        $this->go_to( '/?feed=rss2' );
+
+        // Default: Links to image attachment page url
+        $actual = gallery_shortcode(
+            array(
+                'ids' => self::$large_id,
+            )
+        );
+        $this->assertContains( '?attachment_id=', $actual );
+
+        // File: Links to image file url
+        $actual = gallery_shortcode(
+            array(
+                'ids'  => self::$large_id,
+                'link' => 'file',
+            )
+        );
+        $this->assertTrue( 2 === substr_count( $actual, '.jpg' ) );
+
+        // None: Does not link
+        $actual = gallery_shortcode(
+            array(
+                'ids'  => self::$large_id,
+                'link' => 'none',
+            )
+        );
+        $this->assertFalse( strpos( $actual, '<a ' ) );
+    }
+
 }