Changeset 38476 for branches/4.6

Timestamp:

08/31/2016 06:43:21 PM (8 years ago)

Author:

jeremyfelt

Message:

Post Thumbnails: Prevent post thumbnail previews from spilling into other images.

After [38118], when previewing a page with a secondary loop, all post
thumbnails would be filtered to display the post thumbnail for the
page being previewed. This ensures _wp_preview_post_thumbnail_filter()
is only applied if the $post_id of the post meta being filtered is
equal to the post or page being previewed.

Merge of [38433] to the 4.6 branch.

Props swissspidy, joemcgill.
Fixes #37697.

Location:

branches/4.6

Files:

• . (modified) (1 prop)
• src/wp-includes/revision.php (modified) (1 diff)
• tests/phpunit/tests/post/thumbnails.php (modified) (1 diff)

branches/4.6/src/wp-includes/revision.php

@@ -595 +595 @@
     }
 
-    if ( empty( $_REQUEST['_thumbnail_id'] ) || $post->ID != $post_id || '_thumbnail_id' != $meta_key || 'revision' == $post->post_type ) {
+    if ( empty( $_REQUEST['_thumbnail_id'] ) ||
+         empty( $_REQUEST['preview_id'] ) ||
+         $post->ID != $post_id ||
+         '_thumbnail_id' != $meta_key ||
+         'revision' == $post->post_type ||
+         $post_id != $_REQUEST['preview_id']
+    ) {
         return $value;
     }

branches/4.6/tests/phpunit/tests/post/thumbnails.php

@@ -243 +243 @@
         $GLOBALS['post'] = self::$post;
         $_REQUEST['_thumbnail_id'] = self::$attachment_id;
+        $_REQUEST['preview_id'] = self::$post->ID;
 
         $result = _wp_preview_post_thumbnail_filter( '', self::$post->ID, '_thumbnail_id' );
+
+        // Clean up.
+        $GLOBALS['post'] = $old_post;
+        unset( $_REQUEST['_thumbnail_id'] );
+        unset( $_REQUEST['preview_id'] );
+
         $this->assertEquals( self::$attachment_id, $result );
-
+    }
+
+    /**
+     * @ticket 37697
+     */
+    function test__wp_preview_post_thumbnail_filter_secondary_post() {
+        $old_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
+
+        $secondary_post = self::factory()->post->create( array(
+                'post_stauts' => 'publish',
+            )
+        );
+
+        $GLOBALS['post'] = self::$post;
+        $_REQUEST['_thumbnail_id'] = self::$attachment_id;
+        $_REQUEST['preview_id'] = $secondary_post;
+
+        $result = _wp_preview_post_thumbnail_filter( '', self::$post->ID, '_thumbnail_id' );
+
+        // Clean up.
+        $GLOBALS['post'] = $old_post;
         unset( $_REQUEST['_thumbnail_id'] );
-        if ( null === $old_post ) {
-            unset( $GLOBALS['post'] );
-        } else {
-            $GLOBALS['post'] = $old_post;
-        }
+        unset( $_REQUEST['preview_id'] );
+
+        $this->assertEmpty( $result );
     }