Changeset 33773

Timestamp:

08/27/2015 08:56:54 PM (8 years ago)

Author:

johnbillion

Message:

Don't change the View Post button permalink in the sample permalink HTML when updating the slug on a published or future post.

Fixes #32954
Props boonebgorges, johnbillion

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

@@ -1309 +1309 @@
         $post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
         $display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
-        $pretty_permalink = str_replace( array( '%pagename%', '%postname%' ), $post_name, urldecode( $permalink ) );
 
         $return =  '<strong>' . __( 'Permalink:' ) . "</strong>\n";
@@ -1325 +1324 @@
             $return .= "<span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
         } else {
-            if ( empty( $pretty_permalink ) ) {
-                $pretty_permalink = $permalink;
+            if ( 'publish' === $post->post_status ) {
+                // View Post button should always go to the saved permalink.
+                $pretty_permalink = get_permalink( $post );
+            } else {
+                // Allow non-published (private, future) to be viewed at a pretty permalink.
+                $pretty_permalink = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, urldecode( $permalink ) );
             }
 

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

@@ -316 +316 @@
 
     /**
+     * @ticket 32954
+     */
+    public function test_get_sample_permalink_html_should_use_correct_permalink_for_view_post_button_when_changing_slug() {
+        global $wp_rewrite;
+        $old_permalink_structure = get_option( 'permalink_structure' );
+        $permalink_structure = '%postname%';
+        $wp_rewrite->set_permalink_structure( "/$permalink_structure/" );
+        flush_rewrite_rules();
+
+        wp_set_current_user( $this->factory->user->create( array( 'role' => 'administrator' ) ) );
+
+        // Published posts should use published permalink
+        $p = $this->factory->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
+
+        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $post = get_post( $p );
+        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/" . $post->post_name . "/'", $found );
+
+        // Scheduled posts should use published permalink
+        $future_date = date( 'Y-m-d H:i:s', time() + 100 );
+        $p = $this->factory->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
+
+        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $post = get_post( $p );
+        $this->assertContains( "span id='view-post-btn'><a href='" . get_option( 'home' ) . "/" . $post->post_name . "/'", $found );
+
+        // Draft posts should use preview link
+        $p = $this->factory->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
+
+        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $post = get_post( $p );
+
+        $preview_link = get_permalink( $post->ID );
+        $preview_link = add_query_arg( 'preview', 'true', $preview_link );
+
+        $this->assertContains( "span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "'", $found );
+
+        $wp_rewrite->set_permalink_structure( $old_permalink_structure );
+        flush_rewrite_rules();
+    }
+
+    /**
      * @ticket 5305
      */