<!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>[16351] trunk/wp-includes: Split get_search_sql().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16351">16351</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-11-13 18:18:45 +0000 (Sat, 13 Nov 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Split get_search_sql(). See <a href="http://trac.wordpress.org/ticket/15170">#15170</a>. See <a href="http://trac.wordpress.org/ticket/15032">#15032</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesclasswpobjectqueryphp">trunk/wp-includes/class-wp-object-query.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesclasswpobjectqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-object-query.php (16350 => 16351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-object-query.php 2010-11-13 17:21:40 UTC (rev 16350)
+++ trunk/wp-includes/class-wp-object-query.php 2010-11-13 18:18:45 UTC (rev 16351)
</span><span class="lines">@@ -70,32 +70,6 @@
</span><span class="cx">
</span><span class="cx"> $qv['meta_query'] = $meta_query;
</span><span class="cx"> }
</span><del>-
- /*
- * Used internally to generate an SQL string for searching across multiple columns
- *
- * @access protected
- * @since 3.1.0
- *
- * @param string $string
- * @param array $cols
- * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
- * @return string
- */
- function get_search_sql( $string, $cols, $wild = false ) {
- $string = esc_sql( $string );
-
- $searches = array();
- $wild_char = ( $wild ) ? '%' : '';
- foreach ( $cols as $col ) {
- if ( 'ID' == $col )
- $searches[] = "$col = '$string'";
- else
- $searches[] = "$col LIKE '$string$wild_char'";
- }
-
- return ' AND (' . implode(' OR ', $searches) . ')';
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (16350 => 16351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-11-13 17:21:40 UTC (rev 16350)
+++ trunk/wp-includes/comment.php 2010-11-13 18:18:45 UTC (rev 16351)
</span><span class="lines">@@ -341,6 +341,26 @@
</span><span class="cx">
</span><span class="cx"> return $comments;
</span><span class="cx"> }
</span><ins>+
+ /*
+ * Used internally to generate an SQL string for searching across multiple columns
+ *
+ * @access protected
+ * @since 3.1.0
+ *
+ * @param string $string
+ * @param array $cols
+ * @return string
+ */
+ function get_search_sql( $string, $cols ) {
+ $string = esc_sql( $string );
+
+ $searches = array();
+ foreach ( $cols as $col )
+ $searches[] = "$col LIKE '%$string%'";
+
+ return ' AND (' . implode(' OR ', $searches) . ')';
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (16350 => 16351)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-11-13 17:21:40 UTC (rev 16350)
+++ trunk/wp-includes/user.php 2010-11-13 18:18:45 UTC (rev 16351)
</span><span class="lines">@@ -526,6 +526,32 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /*
+ * Used internally to generate an SQL string for searching across multiple columns
+ *
+ * @access protected
+ * @since 3.1.0
+ *
+ * @param string $string
+ * @param array $cols
+ * @param bool $wild Whether to allow trailing wildcard searches. Default is false.
+ * @return string
+ */
+ function get_search_sql( $string, $cols, $wild = false ) {
+ $string = esc_sql( $string );
+
+ $searches = array();
+ $wild_char = ( $wild ) ? '%' : '';
+ foreach ( $cols as $col ) {
+ if ( 'ID' == $col )
+ $searches[] = "$col = '$string'";
+ else
+ $searches[] = "$col LIKE '$string$wild_char'";
+ }
+
+ return ' AND (' . implode(' OR ', $searches) . ')';
+ }
+
</ins><span class="cx"> /**
</span><span class="cx"> * Return the list of users
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>