Ticket #14760: wp_get_shortlink-3.diff

link-template.php

@@ -2385 +2385 @@
 
         global $wp_query;
         $post_id = 0;
-        if ( 'query' == $context && is_single() ) {
+        if ( 'query' == $context && is_singular() ) { 
                 $post_id = $wp_query->get_queried_object_id();
         } elseif ( 'post' == $context ) {
                 $post = get_post($id);
@@ -2394 +2394 @@
 
         $shortlink = '';
 
-        // Return p= link for posts.
-        if ( !empty($post_id) && '' != get_option('permalink_structure') ) {
-                $post = get_post($post_id);
-                if ( isset($post->post_type) && 'post' == $post->post_type )
-                        $shortlink = home_url('?p=' . $post->ID);
+        // Return p= link for all public post types.
+        if ( !empty($post_id) ) {
+                if (!isset($post)) {
+                        $post = get_post($post_id);
+                }
+                $post_type = get_post_type_object( $post->post_type );
+                if ( $post_type->public ) {
+                        $shortlink = home_url('?p=' . $post_id);
+                }
         }
 
         return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);