Ticket #14760: wp_get_shortlink.diff

wp-includes/link-template.php

@@ -2358 +2358 @@
  * Return a shortlink for a post, page, attachment, or blog.
  *
  * This function exists to provide a shortlink tag that all themes and plugins can target.  A plugin must hook in to
- * provide the actual shortlinks.  Default shortlink support is limited to providing ?p= style links for posts.
+ * provide the actual shortlinks.  Default shortlink support is limited to providing ?p= style links.
  * Plugins can short circuit this function via the pre_get_shortlink filter or filter the output
  * via the get_shortlink filter.
  *
@@ -2377 +2377 @@
 
         global $wp_query;
         $post_id = 0;
-        if ( 'query' == $context && is_single() ) {
+        if ( 'query' == $context && (is_single() || is_page()) ) {
                 $post_id = $wp_query->get_queried_object_id();
         } elseif ( 'post' == $context ) {
                 $post = get_post($id);
@@ -2389 +2389 @@
         // 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 )
+                if ( isset($post->post_type) )
                         $shortlink = home_url('?p=' . $post->ID);
         }