Changeset 36853

Timestamp:

03/05/2016 03:55:33 AM (9 years ago)

Author:

johnbillion

Message:

Posts, Post Types: Ensure that non-ASCII characters in attachment slugs aren't shown in urlencoded form in the sample permalink UI.

Fixes #35980

Location:

trunk

Files:

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

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

@@ -1303 +1303 @@
             } else {
                 // Allow non-published (private, future) to be viewed at a pretty permalink.
-                $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, urldecode( $permalink ) );
+                $view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
             }
         }
@@ -1313 +1313 @@
 
         if ( false !== $view_link ) {
-            $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $view_link . "</a>\n";
+            $display_link = urldecode( $view_link );
+            $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a>\n";
         } else {
             $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";

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

@@ -281 +281 @@
         $found = get_sample_permalink_html( $p );
         $this->assertContains( 'href="' . get_option( 'home' ) . '/?p=' . $p . '"', $found );
+        $this->assertContains( '>' . get_option( 'home' ) . '/?p=' . $p . '<', $found );
     }
 
@@ -293 +294 @@
 
         $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-        $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'foo', 'post_date' => $future_date ) );
+        $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'foo-صورة', 'post_date' => $future_date ) );
 
         $found = get_sample_permalink_html( $p );
         $post = get_post( $p );
         $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found );
+        $this->assertContains( '>' . urldecode( $post->post_name ) . '<', $found );
+    }
+
+    /**
+     * @ticket 35980
+     */
+    public function test_get_sample_permalink_html_should_use_pretty_permalink_for_view_attachment_link_when_pretty_permalinks_are_enabled() {
+        $this->set_permalink_structure( '/%postname%/' );
+
+        wp_set_current_user( self::$admin_id );
+
+        $p = self::factory()->attachment->create_object( 'صورة.jpg', 0, array(
+            'post_mime_type' => 'image/jpeg',
+            'post_type'      => 'attachment',
+            'post_title'     => 'صورة',
+            'post_status'    => 'inherit',
+        ) );
+
+        $found = get_sample_permalink_html( $p );
+        $post = get_post( $p );
+        $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found );
+        $this->assertContains( '>' . urldecode( get_permalink( $post ) ) . '<', $found );
     }
 
@@ -310 +333 @@
 
         // Published posts should use published permalink
-        $p = self::factory()->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo' ) );
-
-        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $p = self::factory()->post->create( array( 'post_status' => 'publish', 'post_name' => 'foo-صورة' ) );
+
+        $found = get_sample_permalink_html( $p, null, 'new_slug-صورة' );
         $post = get_post( $p );
         $message = 'Published post';
         $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
+        $this->assertContains( '>new_slug-صورة<', $found, $message );
 
         // Scheduled posts should use published permalink
         $future_date = date( 'Y-m-d H:i:s', time() + 100 );
-        $p = self::factory()->post->create( array( 'post_status' => 'future', 'post_name' => 'bar', 'post_date' => $future_date ) );
-
-        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $p = self::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 );
         $message = 'Scheduled post';
         $this->assertContains( 'href="' . get_option( 'home' ) . "/" . $post->post_name . '/"', $found, $message );
+        $this->assertContains( '>new_slug-صورة<', $found, $message );
 
         // Draft posts should use preview link
-        $p = self::factory()->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz' ) );
-
-        $found = get_sample_permalink_html( $p, null, 'new_slug' );
+        $p = self::factory()->post->create( array( 'post_status' => 'draft', 'post_name' => 'baz-صورة' ) );
+
+        $found = get_sample_permalink_html( $p, null, 'new_slug-صورة' );
         $post = get_post( $p );
         $message = 'Draft post';
@@ -337 +362 @@
 
         $this->assertContains( 'href="' . esc_url( $preview_link ) . '"', $found, $message );
+        $this->assertContains( '>new_slug-صورة<', $found, $message );
     }