Changeset 14478

Timestamp:

05/06/2010 06:03:05 PM (14 years ago)

Author:

nacin

Message:

Prevent ambiguous table aliases in wp_post_mime_type_where. props stephdau, jfarthing84, fixes #12750.

Location:

trunk/wp-includes

Files:

• post.php (modified) (2 diffs)
• query.php (modified) (3 diffs)

trunk/wp-includes/post.php

@@ -1574 +1574 @@
  *
  * @param string|array $mime_types List of mime types or comma separated string of mime types.
+ * @param string $table_alias Optional. Specify a table alias, if needed. 
  * @return string The SQL AND clause for mime searching.
  */
-function wp_post_mime_type_where($post_mime_types) {
+function wp_post_mime_type_where($post_mime_types, $table_alias = '') {
     $where = '';
     $wildcards = array('', '%', '%/%');
@@ -1604 +1605 @@
 
         if ( false !== strpos($mime_pattern, '%') )
-            $wheres[] = "post_mime_type LIKE '$mime_pattern'";
+            $wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
         else
-            $wheres[] = "post_mime_type = '$mime_pattern'";
+            $wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
     }
     if ( !empty($wheres) )

trunk/wp-includes/query.php

@@ -2027 +2027 @@
                 if ( !is_wp_error($post_ids) && !empty($post_ids) ) {
                     $whichcat .= " AND $wpdb->posts.ID IN (" . implode(', ', $post_ids) . ") ";
-                    if ( '' === $post_type ) {
+                    if ( empty($post_type) ) {
                         $post_type = 'any';
                         $post_status_join = true;
@@ -2033 +2033 @@
                         $post_status_join = true;
                     }
-                    $q['post_status'] = 'publish';
+                    if ( empty($q['post_status']) )
+                        $q['post_status'] = 'publish';
                 } else {
                     $whichcat = " AND 0 ";
@@ -2084 +2085 @@
         // MIME-Type stuff for attachment browsing
 
-        if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] )
-            $whichmimetype = wp_post_mime_type_where($q['post_mime_type']);
+        if ( isset($q['post_mime_type']) && '' != $q['post_mime_type'] ) {
+            $table_alias = $post_status_join ? $wpdb->posts : '';
+            $whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $table_alias);
+        }
 
         $where .= $search . $whichcat . $whichauthor . $whichmimetype;