<!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" />
<title>[BuddyPress][7008] trunk: Improve search_terms SQL clause in BP_User_Query</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7008">7008</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-05-06 19:51:30 +0000 (Mon, 06 May 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve search_terms SQL clause in BP_User_Query
Standardizing the way that apostrophes and other special characters are
escaped in the LIKE claues means that we won't miss items "O'Conner" in member
search.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/4933">#4933</a>
Props dontdream</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreclassesphp">trunk/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunkteststestcasescoreclassesphp">trunk/tests/testcases/core/classes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-classes.php (7007 => 7008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-classes.php 2013-05-06 19:35:16 UTC (rev 7007)
+++ trunk/bp-core/bp-core-classes.php 2013-05-06 19:51:30 UTC (rev 7008)
</span><span class="lines">@@ -317,7 +317,10 @@
</span><span class="cx"> // To avoid global joins, do a separate query
</span><span class="cx"> // @todo remove need for bp_is_active() check
</span><span class="cx"> if ( false !== $search_terms && bp_is_active( 'xprofile' ) ) {
</span><del>- $found_user_ids = $wpdb->get_col( $wpdb->prepare( "SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE %s", '%%' . like_escape( $search_terms ) . '%%' ) );
</del><ins>+ $search_terms_clean = mysql_real_escape_string( mysql_real_escape_string( $search_terms ) );
+ $search_terms_clean = like_escape( $search_terms_clean );
+ $found_user_ids_query = "SELECT user_id FROM {$bp->profile->table_name_data} WHERE value LIKE '%" . $search_terms_clean . "%'";
+ $found_user_ids = $wpdb->get_col( $found_user_ids_query );
</ins><span class="cx">
</span><span class="cx"> if ( ! empty( $found_user_ids ) ) {
</span><span class="cx"> $sql['where'][] = "u.{$this->uid_name} IN (" . implode( ',', wp_parse_id_list( $found_user_ids ) ) . ")";
</span></span></pre></div>
<a id="trunkteststestcasescoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/testcases/core/classes.php (7007 => 7008)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/testcases/core/classes.php 2013-05-06 19:35:16 UTC (rev 7007)
+++ trunk/tests/testcases/core/classes.php 2013-05-06 19:51:30 UTC (rev 7008)
</span><span class="lines">@@ -100,4 +100,54 @@
</span><span class="cx"> $expected = array( $u4, $u3, $u2, $u1 );
</span><span class="cx"> $this->assertEquals( $expected, $user_ids );
</span><span class="cx"> }
</span><ins>+
+ public function test_bp_user_query_search_with_apostrophe() {
+ // Apostrophe. Search_terms must escaped to mimic POST payload
+ $user_id = $this->create_user();
+ xprofile_set_field_data( 1, $user_id, "Foo'Bar" );
+ $q = new BP_User_Query( array( 'search_terms' => "oo\'Ba", ) );
+
+ $found_user_id = null;
+ if ( ! empty( $q->results ) ) {
+ $found_user = array_pop( $q->results );
+ $found_user_id = $found_user->ID;
+ }
+
+ $this->assertEquals( $user_id, $found_user_id );
+ }
+
+ public function test_bp_user_query_search_with_percent_sign() {
+
+ // LIKE special character: %
+ $user_id = $this->create_user();
+ xprofile_set_field_data( 1, $user_id, "Foo%Bar" );
+ $q = new BP_User_Query( array( 'search_terms' => "oo%Bar", ) );
+
+ $found_user_id = null;
+ if ( ! empty( $q->results ) ) {
+ $found_user = array_pop( $q->results );
+ $found_user_id = $found_user->ID;
+ }
+
+ $this->assertEquals( $user_id, $found_user_id );
+
+ }
+
+ public function test_bp_user_query_search_with_underscore() {
+
+ // LIKE special character: _
+ $user_id = $this->create_user();
+ xprofile_set_field_data( 1, $user_id, "Foo_Bar" );
+ $q = new BP_User_Query( array( 'search_terms' => "oo_Bar", ) );
+
+ $found_user_id = null;
+ if ( ! empty( $q->results ) ) {
+ $found_user = array_pop( $q->results );
+ $found_user_id = $found_user->ID;
+ }
+
+ $this->assertEquals( $user_id, $found_user_id );
+
+ }
+
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>