From acf3ee37e3033cdc8d59fc73736e4ee4b98b0ad3 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Thu, 12 Sep 2013 17:30:10 +0000
Subject: [PATCH] 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.



Built from https://develop.svn.wordpress.org/trunk@25404


git-svn-id: http://core.svn.wordpress.org/trunk@25334 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/link-template.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 4264d784ef..9ba51f4e1d 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -2417,7 +2417,8 @@ function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		$post_id = $post->ID;
+		if ( ! empty( $post->ID ) )
+			$post_id = $post->ID;
 	}
 
 	$shortlink = '';