Changeset 25404

Timestamp:

09/12/2013 05:30:01 PM (12 years ago)

Author:

wonderboymusic

Message:

Fix the failing Tests_Link::test_wp_get_shortlink() assertion:

• wp_get_shortlink() was firing a notice when reading $post->ID while $post was null in some cases
• Before the assertions that assume $GLOBALS['post'] is not set, call unset( $GLOBALS['post'] ); - there was global spillage from other tests

See #25282.

Location:

trunk

Files:

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

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

@@ -2418 +2418 @@
     } elseif ( 'post' == $context ) {
         $post = get_post( $id );
-        $post_id = $post->ID;
+        if ( ! empty( $post->ID ) )
+            $post_id = $post->ID;
     }
 

trunk/tests/phpunit/tests/link.php

@@ -35 +35 @@
         // Basic case
         $this->assertEquals( get_permalink( $post_id ), wp_get_shortlink( $post_id, 'post' ) );
+
+        unset( $GLOBALS['post'] );
 
         // Global post is not set