<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[13501] trunk/wp-includes/query.php:
Add meta_value_num meta_key ordering for WP_Query.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13501">13501</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-02-28 12:49:10 +0000 (Sun, 28 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add meta_value_num meta_key ordering for WP_Query. Allows Natural numeric ordering of results. Props stencil & scribu for cleanups. Fixes <a href="http://trac.wordpress.org/ticket/10649">#10649</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (13500 => 13501)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-02-28 12:39:28 UTC (rev 13500)
+++ trunk/wp-includes/query.php 2010-02-28 12:49:10 UTC (rev 13501)
</span><span class="lines">@@ -2056,16 +2056,18 @@
</span><span class="cx"> if ( !empty($q['meta_key']) ) {
</span><span class="cx"> $allowed_keys[] = $q['meta_key'];
</span><span class="cx"> $allowed_keys[] = 'meta_value';
</span><ins>+ $allowed_keys[] = 'meta_value_num';
</ins><span class="cx"> }
</span><span class="cx"> $q['orderby'] = urldecode($q['orderby']);
</span><span class="cx"> $q['orderby'] = addslashes_gpc($q['orderby']);
</span><del>- $orderby_array = explode(' ',$q['orderby']);
- if ( empty($orderby_array) )
- $orderby_array[] = $q['orderby'];
</del><ins>+ $orderby_array = explode(' ', $q['orderby']);
</ins><span class="cx"> $q['orderby'] = '';
</span><del>- for ($i = 0; $i < count($orderby_array); $i++) {
</del><ins>+
+ foreach ( $orderby_array as $i => $orderby ) {
</ins><span class="cx"> // Only allow certain values for safety
</span><del>- $orderby = $orderby_array[$i];
</del><ins>+ if ( ! in_array($orderby, $allowed_keys) )
+ continue;
+
</ins><span class="cx"> switch ($orderby) {
</span><span class="cx"> case 'menu_order':
</span><span class="cx"> break;
</span><span class="lines">@@ -2079,15 +2081,19 @@
</span><span class="cx"> case 'meta_value':
</span><span class="cx"> $orderby = "$wpdb->postmeta.meta_value";
</span><span class="cx"> break;
</span><ins>+ case 'meta_value_num':
+ $orderby = "$wpdb->postmeta.meta_value+0";
+ break;
</ins><span class="cx"> case 'comment_count':
</span><span class="cx"> $orderby = "$wpdb->posts.comment_count";
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> $orderby = "$wpdb->posts.post_" . $orderby;
</span><span class="cx"> }
</span><del>- if ( in_array($orderby_array[$i], $allowed_keys) )
- $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
</del><ins>+
+ $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> // append ASC or DESC at the end
</span><span class="cx"> if ( !empty($q['orderby']))
</span><span class="cx"> $q['orderby'] .= " {$q['order']}";
</span><span class="lines">@@ -2644,7 +2650,7 @@
</span><span class="cx"> } elseif ( $this->is_tax ) {
</span><span class="cx"> $tax = $this->get('taxonomy');
</span><span class="cx"> $slug = $this->get('term');
</span><del>- $term = &get_terms($tax, array('slug'=>$slug));
</del><ins>+ $term = &get_terms($tax, array( 'slug' => $slug ) );
</ins><span class="cx"> if ( is_wp_error($term) || empty($term) )
</span><span class="cx"> return NULL;
</span><span class="cx"> $term = $term[0];
</span><span class="lines">@@ -2656,7 +2662,7 @@
</span><span class="cx"> } elseif ( $this->is_single ) {
</span><span class="cx"> $this->queried_object = $this->post;
</span><span class="cx"> $this->queried_object_id = (int) $this->post->ID;
</span><del>- } elseif ( $this->is_page ) {
</del><ins>+ } elseif ( $this->is_page && !is_null($this->post) ) {
</ins><span class="cx"> $this->queried_object = $this->post;
</span><span class="cx"> $this->queried_object_id = (int) $this->post->ID;
</span><span class="cx"> } elseif ( $this->is_author ) {
</span></span></pre>
</div>
</div>
</body>
</html>