<!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>[17653] trunk/wp-includes/query.php: Don't pollute orderby query var.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/17653">17653</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-04-18 21:27:13 +0000 (Mon, 18 Apr 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't pollute orderby query var. Props scribu. fixes <a href="http://trac.wordpress.org/ticket/16844">#16844</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 (17652 => 17653)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2011-04-18 20:38:59 UTC (rev 17652)
+++ trunk/wp-includes/query.php 2011-04-18 21:27:13 UTC (rev 17653)
</span><span class="lines">@@ -2291,9 +2291,9 @@
</span><span class="cx">
</span><span class="cx"> // Order by
</span><span class="cx"> if ( empty($q['orderby']) ) {
</span><del>- $q['orderby'] = "$wpdb->posts.post_date " . $q['order'];
</del><ins>+ $orderby = "$wpdb->posts.post_date " . $q['order'];
</ins><span class="cx"> } elseif ( 'none' == $q['orderby'] ) {
</span><del>- $q['orderby'] = '';
</del><ins>+ $orderby = '';
</ins><span class="cx"> } else {
</span><span class="cx"> // Used to filter values
</span><span class="cx"> $allowed_keys = array('author', 'date', 'title', 'modified', 'menu_order', 'parent', 'ID', 'rand', 'comment_count');
</span><span class="lines">@@ -2304,10 +2304,9 @@
</span><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']);
- $q['orderby'] = '';
</del><span class="cx">
</span><del>- foreach ( $orderby_array as $i => $orderby ) {
</del><ins>+ $orderby_array = array();
+ foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
</ins><span class="cx"> // Only allow certain values for safety
</span><span class="cx"> if ( ! in_array($orderby, $allowed_keys) )
</span><span class="cx"> continue;
</span><span class="lines">@@ -2335,15 +2334,14 @@
</span><span class="cx"> $orderby = "$wpdb->posts.post_" . $orderby;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $q['orderby'] .= (($i == 0) ? '' : ',') . $orderby;
</del><ins>+ $orderby_array[] = $orderby;
</ins><span class="cx"> }
</span><ins>+ $orderby = implode( ',', $orderby_array );
</ins><span class="cx">
</span><del>- // append ASC or DESC at the end
- if ( !empty($q['orderby']))
- $q['orderby'] .= " {$q['order']}";
-
- if ( empty($q['orderby']) )
- $q['orderby'] = "$wpdb->posts.post_date ".$q['order'];
</del><ins>+ if ( empty( $orderby ) )
+ $orderby = "$wpdb->posts.post_date ".$q['order'];
+ else
+ $orderby .= " {$q['order']}";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( is_array( $post_type ) ) {
</span><span class="lines">@@ -2542,8 +2540,6 @@
</span><span class="cx"> $where = "AND 0";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $orderby = $q['orderby'];
-
</del><span class="cx"> $pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
</span><span class="cx">
</span><span class="cx"> // Apply post-paging filters on where and join. Only plugins that
</span></span></pre>
</div>
</div>
</body>
</html>