Changeset 38583

Timestamp:

09/09/2016 12:47:17 AM (8 years ago)

Author:

johnbillion

Message:

Themes: Add the non-encoded form of the queried item slug to the template hierarchy when the slug contains non-ASCII characters.

This affects category, tag, and custom taxonomy archives, and single posts, pages, and custom post types.

Fixes #37655

Location:

trunk

Files:

• src/wp-includes/template.php (modified) (5 diffs)
• tests/phpunit/tests/template.php (modified) (13 diffs)

trunk/src/wp-includes/template.php

@@ -190 +190 @@
 
     if ( ! empty( $category->slug ) ) {
+
+        $slug_decoded = urldecode( $category->slug );
+        if ( $slug_decoded !== $category->slug ) {
+            $templates[] = "category-{$slug_decoded}.php";
+        }
+
         $templates[] = "category-{$category->slug}.php";
         $templates[] = "category-{$category->term_id}.php";
@@ -220 +226 @@
 
     if ( ! empty( $tag->slug ) ) {
+
+        $slug_decoded = urldecode( $tag->slug );
+        if ( $slug_decoded !== $tag->slug ) {
+            $templates[] = "tag-{$slug_decoded}.php";
+        }
+
         $templates[] = "tag-{$tag->slug}.php";
         $templates[] = "tag-{$tag->term_id}.php";
@@ -256 +268 @@
     if ( ! empty( $term->slug ) ) {
         $taxonomy = $term->taxonomy;
+
+        $slug_decoded = urldecode( $term->slug );
+        if ( $slug_decoded !== $term->slug ) {
+            $templates[] = "taxonomy-$taxonomy-{$slug_decoded}.php";
+        }
+
         $templates[] = "taxonomy-$taxonomy-{$term->slug}.php";
         $templates[] = "taxonomy-$taxonomy.php";
@@ -350 +368 @@
     if ( $template && 0 === validate_file( $template ) )
         $templates[] = $template;
-    if ( $pagename )
+    if ( $pagename ) {
+        $pagename_decoded = urldecode( $pagename );
+        if ( $pagename_decoded !== $pagename ) {
+            $templates[] = "page-{$pagename_decoded}.php";
+        }
         $templates[] = "page-$pagename.php";
+    }
     if ( $id )
         $templates[] = "page-$id.php";
@@ -410 +433 @@
 
     if ( ! empty( $object->post_type ) ) {
+
+        $name_decoded = urldecode( $object->post_name );
+        if ( $name_decoded !== $object->post_name ) {
+            $templates[] = "single-{$object->post_type}-{$name_decoded}.php";
+        }
+
         $templates[] = "single-{$object->post_type}-{$object->post_name}.php";
         $templates[] = "single-{$object->post_type}.php";

trunk/tests/phpunit/tests/template.php

@@ -17 +17 @@
         self::$page_on_front = $factory->post->create_and_get( array(
             'post_type' => 'page',
-            'post_name' => 'page-on-front',
+            'post_name' => 'page-on-front-😀',
         ) );
 
         self::$page_for_posts = $factory->post->create_and_get( array(
             'post_type' => 'page',
-            'post_name' => 'page-for-posts',
+            'post_name' => 'page-for-posts-😀',
         ) );
 
         self::$page = $factory->post->create_and_get( array(
             'post_type' => 'page',
-            'post_name' => 'page-name',
+            'post_name' => 'page-name-😀',
         ) );
         add_post_meta( self::$page->ID, '_wp_page_template', 'templates/page.php' );
@@ -33 +33 @@
         self::$post = $factory->post->create_and_get( array(
             'post_type' => 'post',
-            'post_name' => 'post-name',
+            'post_name' => 'post-name-😀',
             'post_date' => '1984-02-25 12:34:56',
         ) );
@@ -85 +85 @@
         $term = self::factory()->term->create_and_get( array(
             'taxonomy' => 'category',
-            'slug'     => 'foo',
+            'slug'     => 'foo-😀',
         ) );
 
         $this->assertTemplateHierarchy( get_term_link( $term ), array(
-            'category-foo.php',
+            'category-foo-😀.php',
+            'category-foo-%f0%9f%98%80.php',
             "category-{$term->term_id}.php",
             'category.php',
@@ -99 +100 @@
         $term = self::factory()->term->create_and_get( array(
             'taxonomy' => 'post_tag',
-            'slug'     => 'foo',
+            'slug'     => 'foo-😀',
         ) );
 
         $this->assertTemplateHierarchy( get_term_link( $term ), array(
-            'tag-foo.php',
+            'tag-foo-😀.php',
+            'tag-foo-%f0%9f%98%80.php',
             "tag-{$term->term_id}.php",
             'tag.php',
@@ -113 +115 @@
         $term = self::factory()->term->create_and_get( array(
             'taxonomy' => 'taxo',
-            'slug'     => 'foo',
+            'slug'     => 'foo-😀',
         ) );
 
         $this->assertTemplateHierarchy( get_term_link( $term ), array(
-            'taxonomy-taxo-foo.php',
+            'taxonomy-taxo-foo-😀.php',
+            'taxonomy-taxo-foo-%f0%9f%98%80.php',
             'taxonomy-taxo.php',
             'taxonomy.php',
@@ -171 +174 @@
         $this->assertTemplateHierarchy( home_url(), array(
             'front-page.php',
-            'page-page-on-front.php',
+            'page-page-on-front-😀.php',
+            'page-page-on-front-%f0%9f%98%80.php',
             'page-' . self::$page_on_front->ID . '.php',
             'page.php',
@@ -192 +196 @@
         $this->assertTemplateHierarchy( get_permalink( self::$page ), array(
             'templates/page.php',
-            'page-page-name.php',
+            'page-page-name-😀.php',
+            'page-page-name-%f0%9f%98%80.php',
             'page-' . self::$page->ID . '.php',
             'page.php',
@@ -201 +206 @@
     public function test_single_template_hierarchy_for_post() {
         $this->assertTemplateHierarchy( get_permalink( self::$post ), array(
-            'single-post-post-name.php',
+            'single-post-post-name-😀.php',
+            'single-post-post-name-%f0%9f%98%80.php',
             'single-post.php',
             'single.php',
@@ -211 +217 @@
         $cpt = self::factory()->post->create_and_get( array(
             'post_type' => 'cpt',
-            'post_name' => 'cpt-name',
+            'post_name' => 'cpt-name-😀',
         ) );
 
         $this->assertTemplateHierarchy( get_permalink( $cpt ), array(
-            'single-cpt-cpt-name.php',
+            'single-cpt-cpt-name-😀.php',
+            'single-cpt-cpt-name-%f0%9f%98%80.php',
             'single-cpt.php',
             'single.php',
@@ -224 +231 @@
     public function test_attachment_template_hierarchy() {
         $attachment = self::factory()->attachment->create_and_get( array(
-            'post_name'      => 'attachment-name',
+            'post_name'      => 'attachment-name-😀',
             'file'           => 'image.jpg',
             'post_mime_type' => 'image/jpeg',
@@ -233 +240 @@
             'image.php',
             'attachment.php',
-            'single-attachment-attachment-name.php',
+            'single-attachment-attachment-name-😀.php',
+            'single-attachment-attachment-name-%f0%9f%98%80.php',
             'single-attachment.php',
             'single.php',
@@ -245 +253 @@
             'embed-post.php',
             'embed.php',
-            'single-post-post-name.php',
+            'single-post-post-name-😀.php',
+            'single-post-post-name-%f0%9f%98%80.php',
             'single-post.php',
             'single.php',
@@ -257 +266 @@
             'embed.php',
             'templates/page.php',
-            'page-page-name.php',
+            'page-page-name-😀.php',
+            'page-page-name-%f0%9f%98%80.php',
             'page-' . self::$page->ID . '.php',
             'page.php',