Ticket #12106: attachment_fix.diff

wp-includes/theme.php

@@ -909 +909 @@
 /**
  * Retrieve path of attachment template in current or parent template.
  *
- * The attachment path first checks if the first part of the mime type exists.
- * The second check is for the second part of the mime type. The last check is
- * for both types separated by an underscore. If neither are found then the file
- * 'attachment.php' is checked and returned.
+ * Will first look for 'attachment-{mime_type[0]}.php',
+ * The second check is for 'attachment-{mime_type[1]}.php', The third check
+ * is for 'attachment-{mime_type[0]}_{mime_type[1]}.php'. The last check is
+ * for 'attachment.php'.
  *
- * Some examples for the 'text/plain' mime type are 'text.php', 'plain.php', and
- * finally 'text_plain.php'.
+ * Some examples for the 'text/plain' mime type are 'attachment-text_plain.php', 
+ * 'attachment-text.php', 'attachment-plain.php', and finally 'attachment.php'
  *
  * @since 2.0.0
  *
@@ -924 +924 @@
 function get_attachment_template() {
         global $posts;
         $type = explode('/', $posts[0]->post_mime_type);
-        if ( $template = get_query_template($type[0]) )
-                return $template;
-        elseif ( $template = get_query_template($type[1]) )
-                return $template;
-        elseif ( $template = get_query_template("$type[0]_$type[1]") )
-                return $template;
-        else
-                return get_query_template('attachment');
+        
+        $template = array();
+        $templates[] = "attachment-{$type[0]}_{$type[1]}.php";
+        $templates[] = "attachment-{$type[1]}.php";
+        $templates[] = "attachment-{$type[0]}.php";
+        $templates[] = "attachment.php";
+        
+        return apply_filters('attachment_template', locate_template($templates));
 }
 
 /**