Ticket #16478: 16478.4.patch

src/wp-admin/edit-form-advanced.php

@@ -536 +536 @@
         if ( $viewable ) :
                 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html( $post->ID ) : '';
 
-                // As of 4.4, the Get Shortlink button is hidden by default.
-                if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
-                        $shortlink = wp_get_shortlink( $post->ID, 'post' );
-
-                        if ( ! empty( $shortlink ) && $shortlink !== $permalink && home_url( '?page_id=' . $post->ID ) !== $permalink ) {
-                                $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" />' .
-                                        '<button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' .
-                                        __( 'Get Shortlink' ) .
-                                        '</button>';
-                        }
-                }
-
                 if ( $post_type_object->public
                         && ! ( 'pending' === get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) )
                 ) {

src/wp-admin/includes/post.php

@@ -1530 +1530 @@
          */
         $return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
 
+        // As of 4.4, the Get Shortlink button is hidden by default.
+        if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+                $shortlink = wp_get_shortlink( $post->ID, 'post' );
+
+                if ( ! empty( $shortlink ) && $shortlink !== $permalink && home_url( '?page_id=' . $post->ID ) !== $permalink ) {
+                        $return .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" />' .
+                                '<button type="button" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val());">' .
+                                __( 'Get Shortlink' ) .
+                                '</button>';
+                }
+        }
+
         return $return;
 }