Changeset 25030 for trunk/src/wp-includes/link-template.php

Timestamp:

08/15/2013 08:08:06 PM (6 years ago)

Author:

ryan

Message:

wp_get_shortlink() improvements.

• Return shortlinks for pages and public CPTs.
• Return shortlinks even when cruft-free links are not enabled.
• Unit tests

Props sillybean, layotte, cais
fixes #18632
see #14760

File:

• trunk/src/wp-includes/link-template.php (modified) (2 diffs)

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

@@ -2352 +2352 @@
     global $wp_query;
     $post_id = 0;
-    if ( 'query' == $context && is_single() ) {
+    if ( 'query' == $context && is_singular() ) { 
         $post_id = $wp_query->get_queried_object_id();
+        $post = get_post( $post_id );
     } elseif ( 'post' == $context ) {
-        $post = get_post($id);
+        $post = get_post( $id );
         $post_id = $post->ID;
     }
@@ -2361 +2362 @@
     $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 ) ) {
+        $post_type = get_post_type_object( $post->post_type );
+        if ( $post_type->public )
+            $shortlink = home_url('?p=' . $post_id);
     }