Changeset 8922

Timestamp:

09/18/2008 05:34:37 AM (15 years ago)

Author:

azaozz

Message:

Allow posts to be ordered by meta_key, props AaronCampbell, fixes#7431

File:

• trunk/wp-includes/query.php (modified) (4 diffs)

trunk/wp-includes/query.php

@@ -2007 +2007 @@
             // Used to filter values
             $allowed_keys = array('author', 'date', 'category', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand');
+            if ( !empty($q['meta_key']) ) {
+                $allowed_keys[] = $q['meta_key'];
+                $allowed_keys[] = 'meta_value';
+            }
             $q['orderby'] = urldecode($q['orderby']);
             $q['orderby'] = addslashes_gpc($q['orderby']);
@@ -2025 +2029 @@
                         $orderby = 'RAND()';
                         break;
+                    case $q['meta_key']:
+                    case 'meta_value':
+                        $orderby = "$wpdb->postmeta.meta_value";
+                        break;
                     default:
                         $orderby = "$wpdb->posts.post_" . $orderby;
@@ -2110 +2118 @@
             $join .= " LEFT JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
         if ( ! empty($q['meta_key']) )
-            $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
-        if ( ! empty($q['meta_value']) )
-            $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_value = %s ", $q['meta_value']);
+            $where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
+        if ( ! empty($q['meta_value']) ) {
+            if ( ! isset($q['meta_compare']) || empty($q['meta_compare']) || ! in_array($q['meta_compare'], array('=', '!=', '>', '>=', '<', '<=')) )
+                $q['meta_compare'] = '=';
+
+            $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_value {$q['meta_compare']} %s ", $q['meta_value']);
+        }
 
         // Apply filters on where and join prior to paging so that any
@@ -2183 +2195 @@
             $orderby = apply_filters('posts_orderby', $orderby);
             $distinct = apply_filters('posts_distinct', $distinct);
+            $limits = apply_filters( 'post_limits', $limits );
+
+            if ( ! empty($q['meta_key']) )
+                $fields = "$fields, $wpdb->postmeta.meta_value";
+
             $fields = apply_filters('posts_fields', $fields);
-            $limits = apply_filters( 'post_limits', $limits );
         }