<!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>[15626] trunk/wp-includes/query.php: Don't require category__in,
tag__in etc.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15626">15626</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-17 22:27:22 +0000 (Fri, 17 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Don't require category__in, tag__in etc. to be arrays necessarily. Fixes <a href="http://trac.wordpress.org/ticket/14892">#14892</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 (15625 => 15626)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-09-17 17:07:11 UTC (rev 15625)
+++ trunk/wp-includes/query.php 2010-09-17 22:27:22 UTC (rev 15626)
</span><span class="lines">@@ -1286,34 +1286,30 @@
</span><span class="cx"> if ( empty($qv['cat']) || ($qv['cat'] == '0') ) {
</span><span class="cx"> $this->is_category = false;
</span><span class="cx"> } else {
</span><del>- if ( strpos($qv['cat'], '-') !== false ) {
- $this->is_category = false;
- } else {
- $this->is_category = true;
- }
</del><ins>+ $this->is_category = strpos($qv['cat'], '-') !== false;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( '' != $qv['category_name'] ) {
</del><ins>+ if ( !empty($qv['category_name']) ) {
</ins><span class="cx"> $this->is_category = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['category__in']) || empty($qv['category__in']) ) {
</del><ins>+ if ( empty($qv['category__in']) ) {
</ins><span class="cx"> $qv['category__in'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['category__in'] = array_map('absint', $qv['category__in']);
</del><ins>+ $qv['category__in'] = array_map('absint', (array) $qv['category__in']);
</ins><span class="cx"> $this->is_category = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['category__not_in']) || empty($qv['category__not_in']) ) {
</del><ins>+ if ( empty($qv['category__not_in']) ) {
</ins><span class="cx"> $qv['category__not_in'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['category__not_in'] = array_map('absint', $qv['category__not_in']);
</del><ins>+ $qv['category__not_in'] = array_map('absint', (array) $qv['category__not_in']);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['category__and']) || empty($qv['category__and']) ) {
</del><ins>+ if ( empty($qv['category__and']) ) {
</ins><span class="cx"> $qv['category__and'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['category__and'] = array_map('absint', $qv['category__and']);
</del><ins>+ $qv['category__and'] = array_map('absint', (array) $qv['category__and']);
</ins><span class="cx"> $this->is_category = true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1321,40 +1317,40 @@
</span><span class="cx"> $this->is_tag = true;
</span><span class="cx">
</span><span class="cx"> $qv['tag_id'] = absint($qv['tag_id']);
</span><del>- if ( !empty($qv['tag_id']) )
</del><ins>+ if ( !empty($qv['tag_id']) )
</ins><span class="cx"> $this->is_tag = true;
</span><span class="cx">
</span><del>- if ( !is_array($qv['tag__in']) || empty($qv['tag__in']) ) {
</del><ins>+ if ( empty($qv['tag__in']) ) {
</ins><span class="cx"> $qv['tag__in'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['tag__in'] = array_map('absint', $qv['tag__in']);
</del><ins>+ $qv['tag__in'] = array_map('absint', (array) $qv['tag__in']);
</ins><span class="cx"> $this->is_tag = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['tag__not_in']) || empty($qv['tag__not_in']) ) {
</del><ins>+ if ( empty($qv['tag__not_in']) ) {
</ins><span class="cx"> $qv['tag__not_in'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['tag__not_in'] = array_map('absint', $qv['tag__not_in']);
</del><ins>+ $qv['tag__not_in'] = array_map('absint', (array) $qv['tag__not_in']);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !is_array($qv['tag__and']) || empty($qv['tag__and']) ) {
</span><span class="cx"> $qv['tag__and'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['tag__and'] = array_map('absint', $qv['tag__and']);
- $this->is_category = true;
</del><ins>+ $qv['tag__and'] = array_map('absint', (array) $qv['tag__and']);
+ $this->is_tag = true;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['tag_slug__in']) || empty($qv['tag_slug__in']) ) {
</del><ins>+ if ( empty($qv['tag_slug__in']) ) {
</ins><span class="cx"> $qv['tag_slug__in'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['tag_slug__in'] = array_map('sanitize_title', $qv['tag_slug__in']);
</del><ins>+ $qv['tag_slug__in'] = array_map('sanitize_title', (array) $qv['tag_slug__in']);
</ins><span class="cx"> $this->is_tag = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( !is_array($qv['tag_slug__and']) || empty($qv['tag_slug__and']) ) {
</del><ins>+ if ( empty($qv['tag_slug__and']) ) {
</ins><span class="cx"> $qv['tag_slug__and'] = array();
</span><span class="cx"> } else {
</span><del>- $qv['tag_slug__and'] = array_map('sanitize_title', $qv['tag_slug__and']);
</del><ins>+ $qv['tag_slug__and'] = array_map('sanitize_title', (array) $qv['tag_slug__and']);
</ins><span class="cx"> $this->is_tag = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>