Changeset 38583 for trunk/src/wp-includes/template.php

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

File:

• trunk/src/wp-includes/template.php (modified) (5 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";