Changeset 32804

Timestamp:

06/16/2015 08:49:44 PM (10 years ago)

Author:

wonderboymusic

Message:

In get_attachment_template(), pass an array of templates to get_query_template( 'attachment', $templates ), instead of bailing on the first found template.

Props willnorris, jfarthing84, SergeyBiryukov, DrewAPicture, wonderboymusic.
Fixes #15337.

File:

• trunk/src/wp-includes/template.php (modified) (2 diffs)

trunk/src/wp-includes/template.php

@@ -392 +392 @@
  *
  * Some examples for the 'text/plain' mime type are 'text.php', 'plain.php', and
- * finally 'text_plain.php'.
+ * finally 'text-plain.php'.
  *
  * The template path is filterable via the 'attachment_template' hook.
@@ -405 +405 @@
  */
 function get_attachment_template() {
-    global $posts;
-
-    if ( ! empty( $posts ) && isset( $posts[0]->post_mime_type ) ) {
-        $type = explode( '/', $posts[0]->post_mime_type );
-
-        if ( ! empty( $type ) ) {
-            if ( $template = get_query_template( $type[0] ) )
-                return $template;
-            elseif ( ! empty( $type[1] ) ) {
-                if ( $template = get_query_template( $type[1] ) )
-                    return $template;
-                elseif ( $template = get_query_template( "$type[0]_$type[1]" ) )
-                    return $template;
-            }
+    $attachment = get_queried_object();
+
+    $templates = array();
+
+    if ( $attachment ) {
+        if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+            list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+        } else {
+            list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
         }
-    }
-
-    return get_query_template( 'attachment' );
+
+        if ( ! empty( $subtype ) ) {
+            $templates[] = "{$type}-{$subtype}.php";
+            $templates[] = "{$subtype}.php";
+        }
+        $templates[] = "{$type}.php";
+    }
+    $templates[] = 'attachment.php';
+
+    return get_query_template( 'attachment', $templates );
 }