Changeset 13501

Timestamp:

02/28/2010 12:49:10 PM (15 years ago)

Author:

dd32

Message:

Add meta_value_num meta_key ordering for WP_Query. Allows Natural numeric ordering of results. Props stencil & scribu for cleanups. Fixes #10649

File:

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

trunk/wp-includes/query.php

@@ -2057 +2057 @@
                 $allowed_keys[] = $q['meta_key'];
                 $allowed_keys[] = 'meta_value';
+                $allowed_keys[] = 'meta_value_num';
             }
             $q['orderby'] = urldecode($q['orderby']);
             $q['orderby'] = addslashes_gpc($q['orderby']);
-            $orderby_array = explode(' ',$q['orderby']);
-            if ( empty($orderby_array) )
-                $orderby_array[] = $q['orderby'];
+            $orderby_array = explode(' ', $q['orderby']);
             $q['orderby'] = '';
-            for ($i = 0; $i < count($orderby_array); $i++) {
+
+            foreach ( $orderby_array as $i => $orderby ) {
                 // Only allow certain values for safety
-                $orderby = $orderby_array[$i];
+                if ( ! in_array($orderby, $allowed_keys) )
+                    continue;
+
                 switch ($orderby) {
                     case 'menu_order':
@@ -2080 +2082 @@
                         $orderby = "$wpdb->postmeta.meta_value";
                         break;
+                    case 'meta_value_num':
+                        $orderby = "$wpdb->postmeta.meta_value+0";
+                        break;
                     case 'comment_count':
                         $orderby = "$wpdb->posts.comment_count";
@@ -2086 +2091 @@
                         $orderby = "$wpdb->posts.post_" . $orderby;
                 }
-                if ( in_array($orderby_array[$i], $allowed_keys) )
-                    $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
-            }
+
+                $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
+            }
+
             // append ASC or DESC at the end
             if ( !empty($q['orderby']))
@@ -2645 +2651 @@
             $tax = $this->get('taxonomy');
             $slug = $this->get('term');
-            $term = &get_terms($tax, array('slug'=>$slug));
+            $term = &get_terms($tax, array( 'slug' => $slug ) );
             if ( is_wp_error($term) || empty($term) )
                 return NULL;
@@ -2657 +2663 @@
             $this->queried_object = $this->post;
             $this->queried_object_id = (int) $this->post->ID;
-        } elseif ( $this->is_page ) {
+        } elseif ( $this->is_page && !is_null($this->post) ) {
             $this->queried_object = $this->post;
             $this->queried_object_id = (int) $this->post->ID;