Changeset 38572

Timestamp:

09/08/2016 04:04:22 AM (8 years ago)

Author:

jorbin

Message:

Permalinks: Ensure Pending Review Posts permalink posts link to the draft

[34670] made the displayed permalink clickable. For posts that were pending review, the permalink wasn't being properly generated so the link wouldn't go to the preview.

Props knutsp, enshrined.
Fixes #37423.

Location:

trunk

Files:

• src/wp-admin/includes/post.php (modified) (2 diffs)
• tests/phpunit/tests/admin/includesPost.php (modified) (1 diff)

trunk/src/wp-admin/includes/post.php

@@ -1301 +1301 @@
 
     if ( current_user_can( 'read_post', $post->ID ) ) {
-        if ( 'draft' === $post->post_status ) {
+        if ( 'draft' === $post->post_status || empty( $post->post_name ) ) {
             $view_link = get_preview_post_link( $post );
             $preview_target = " target='wp-preview-{$post->ID}'";
@@ -1308 +1308 @@
                 $view_link = get_permalink( $post );
             } else {
-                // Allow non-published (private, future) to be viewed at a pretty permalink.
+                // Allow non-published (private, future) to be viewed at a pretty permalink, in case $post->post_name is set
                 $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
             }

trunk/tests/phpunit/tests/admin/includesPost.php

@@ -358 +358 @@
 
     /**
+     * @ticket 30910
+     * @ticket 18306
+     */
+    public function test_get_sample_permalink_html_should_use_preview_links_for_draft_and_pending_posts_with_no_post_name() {
+        $this->set_permalink_structure( '/%postname%/' );
+
+        wp_set_current_user( self::$admin_id );
+
+        $future_date = date( 'Y-m-d H:i:s', time() + 100 );
+        $p = self::factory()->post->create( array( 'post_status' => 'pending', 'post_name' => '', 'post_date' => $future_date ) );
+
+        $found = get_sample_permalink_html( $p );
+        $post = get_post( $p );
+        $this->assertContains( 'href="' . esc_url( get_preview_post_link( $post ) ), $found );
+    }
+
+    /**
      * @ticket 5305
      */