Changeset 36329

Timestamp:

01/16/2016 10:13:27 AM (9 years ago)

Author:

swissspidy

Message:

Posts: Correctly pass $post to post_password_required() in get_the_excerpt().

Corrects the relevant test.

Props sebastian.pisula for initial patch.
Fixes #35486.

Location:

trunk

Files:

• src/wp-includes/post-template.php (modified) (1 diff)
• tests/phpunit/tests/post/output.php (modified) (1 diff)

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

@@ -373 +373 @@
     }
 
-    if ( post_password_required() ) {
+    if ( post_password_required( $post ) ) {
         return __( 'There is no excerpt because this is a protected post.' );
     }

trunk/tests/phpunit/tests/post/output.php

@@ -200 +200 @@
     /**
      * @ticket 27246
+     * @ticket 35486
      */
     public function test_the_excerpt_password_protected_post() {
-        $GLOBALS['post'] = self::factory()->post->create_and_get( array( 'post_excerpt' => 'Post excerpt', 'post_password' => '1234' ) );
+        $post = self::factory()->post->create_and_get( array( 'post_excerpt' => 'Post excerpt', 'post_password' => '1234' ) );
+        $this->assertSame( 'There is no excerpt because this is a protected post.', get_the_excerpt( $post ) );
+
+        $GLOBALS['post'] = $post;
         $this->assertSame( "<p>There is no excerpt because this is a protected post.</p>\n", get_echo( 'the_excerpt' ) );
-        $this->assertSame( 'There is no excerpt because this is a protected post.', get_the_excerpt() );
     }