<!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>[15755] trunk/wp-includes/classes.php: Add NOT LIKE/BETWEEN/IN.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15755">15755</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-10-08 02:27:22 +0000 (Fri, 08 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add NOT LIKE/BETWEEN/IN. props AaronCampbell, fixes <a href="http://trac.wordpress.org/ticket/9124">#9124</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15754 => 15755)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-10-07 22:58:45 UTC (rev 15754)
+++ trunk/wp-includes/classes.php 2010-10-08 02:27:22 UTC (rev 15755)
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx">
</span><span class="cx"> if ( !empty( $this->query_vars[$wpvar] ) ) {
</span><span class="cx"> if ( ! is_array( $this->query_vars[$wpvar] ) ) {
</span><del>- $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
</del><ins>+ $this->query_vars[$wpvar] = (string) $this->query_vars[$wpvar];
</ins><span class="cx"> } else {
</span><span class="cx"> foreach ( $this->query_vars[$wpvar] as $vkey => $v )
</span><span class="cx"> $this->query_vars[$wpvar][$vkey] = (string) $v;
</span><span class="lines">@@ -550,11 +550,11 @@
</span><span class="cx"> * A query is an associative array:
</span><span class="cx"> * - 'key' string The meta key
</span><span class="cx"> * - 'value' string|array The meta value
</span><del>- * - 'compare' (optional) string How to compare the key to the value.
- * Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN'.
</del><ins>+ * - 'compare' (optional) string How to compare the key to the value.
+ * Possible values: '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN'.
</ins><span class="cx"> * Default: '='
</span><span class="cx"> * - 'type' string (optional) The type of the value.
</span><del>- * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
</del><ins>+ * Possible values: 'NUMERIC', 'BINARY', 'CHAR', 'DATE', 'DATETIME', 'DECIMAL', 'SIGNED', 'TIME', 'UNSIGNED'.
</ins><span class="cx"> * Default: 'CHAR'
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="lines">@@ -573,9 +573,9 @@
</span><span class="cx"> * Possible values: 'term_id', 'slug' or 'name'
</span><span class="cx"> * Default: 'slug'
</span><span class="cx"> * - 'operator' string (optional)
</span><del>- * Possible values: 'IN' and 'NOT IN'.
</del><ins>+ * Possible values: 'IN' and 'NOT IN'.
</ins><span class="cx"> * Default: 'IN'
</span><del>- * - 'include_children' bool (optional) Wether to include child terms.
</del><ins>+ * - 'include_children' bool (optional) Wether to include child terms.
</ins><span class="cx"> * Default: true
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="lines">@@ -636,7 +636,7 @@
</span><span class="cx"> $meta_compare = isset( $q['compare'] ) ? strtoupper( $q['compare'] ) : '=';
</span><span class="cx"> $meta_type = isset( $q['type'] ) ? strtoupper( $q['type'] ) : 'CHAR';
</span><span class="cx">
</span><del>- if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'IN', 'BETWEEN' ) ) )
</del><ins>+ if ( ! in_array( $meta_compare, array( '=', '!=', '>', '>=', '<', '<=', 'LIKE', 'NOT LIKE', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) )
</ins><span class="cx"> $meta_compare = '=';
</span><span class="cx">
</span><span class="cx"> if ( 'NUMERIC' == $meta_type )
</span><span class="lines">@@ -658,7 +658,7 @@
</span><span class="cx"> if ( !empty( $meta_key ) )
</span><span class="cx"> $where .= $wpdb->prepare( " AND $alias.meta_key = %s", $meta_key );
</span><span class="cx">
</span><del>- if ( in_array( $meta_compare, array( 'IN', 'BETWEEN' ) ) ) {
</del><ins>+ if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
</ins><span class="cx"> if ( ! is_array( $meta_value ) )
</span><span class="cx"> $meta_value = preg_split( '/[,\s]+/', $meta_value );
</span><span class="cx"> } else {
</span><span class="lines">@@ -668,14 +668,14 @@
</span><span class="cx"> if ( empty( $meta_value ) )
</span><span class="cx"> continue;
</span><span class="cx">
</span><del>- if ( 'IN' == $meta_compare ) {
</del><ins>+ if ( 'IN' == substr( $meta_compare, -2) ) {
</ins><span class="cx"> $meta_field_types = substr( str_repeat( ',%s', count( $meta_value ) ), 1 );
</span><span class="cx"> $meta_compare_string = "($meta_field_types)";
</span><span class="cx"> unset( $meta_field_types );
</span><del>- } elseif ( 'BETWEEN' == $meta_compare ) {
</del><ins>+ } elseif ( 'BETWEEN' == substr( $meta_compare, -7) ) {
</ins><span class="cx"> $meta_value = array_slice( $meta_value, 0, 2 );
</span><span class="cx"> $meta_compare_string = '%s AND %s';
</span><del>- } elseif ( 'LIKE' == $meta_compare ) {
</del><ins>+ } elseif ( 'LIKE' == substr( $meta_compare, -4 ) ) {
</ins><span class="cx"> $meta_value = '%' . like_escape( $meta_value ) . '%';
</span><span class="cx"> $meta_compare_string = '%s';
</span><span class="cx"> } else {
</span><span class="lines">@@ -708,7 +708,7 @@
</span><span class="cx"> $query['include_children'] = true;
</span><span class="cx">
</span><span class="cx"> $query['do_query'] = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> $sql_single = get_objects_in_term( $query['terms'], $query['taxonomy'], $query );
</span><span class="cx">
</span><span class="cx"> if ( empty( $sql_single ) )
</span></span></pre>
</div>
</div>
</body>
</html>