<!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>[16999] trunk: Add like_escape() to some queries.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16999">16999</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-12-16 14:22:41 +0000 (Thu, 16 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add like_escape() to some queries. fixes <a href="http://trac.wordpress.org/ticket/15764">#15764</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpincludescanonicalphp">trunk/wp-includes/canonical.php</a></li>
<li><a href="#trunkwpincludesclasswpxmlrpcserverphp">trunk/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-admin/admin-ajax.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -1255,11 +1255,11 @@
</span><span class="cx">
</span><span class="cx"> $searchand = $search = '';
</span><span class="cx"> foreach ( (array) $search_terms as $term ) {
</span><del>- $term = addslashes_gpc($term);
</del><ins>+ $term = esc_sql( like_escape( $term ) );
</ins><span class="cx"> $search .= "{$searchand}(($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%'))";
</span><span class="cx"> $searchand = ' AND ';
</span><span class="cx"> }
</span><del>- $term = $wpdb->escape($s);
</del><ins>+ $term = esc_sql( like_escape( $s ) );
</ins><span class="cx"> if ( count($search_terms) > 1 && $search_terms[0] != $s )
</span><span class="cx"> $search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludescanonicalphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/canonical.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/canonical.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/canonical.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -385,7 +385,7 @@
</span><span class="cx"> if ( !get_query_var('name') )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $where = $wpdb->prepare("post_name LIKE %s", get_query_var('name') . '%');
</del><ins>+ $where = $wpdb->prepare("post_name LIKE %s", like_escape( get_query_var('name') ) . '%');
</ins><span class="cx">
</span><span class="cx"> // if any of post_type, year, monthnum, or day are set, use them to refine the query
</span><span class="cx"> if ( get_query_var('post_type') )
</span></span></pre></div>
<a id="trunkwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-wp-xmlrpc-server.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/class-wp-xmlrpc-server.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -3367,7 +3367,7 @@
</span><span class="cx"> } elseif ( is_string($urltest['fragment']) ) {
</span><span class="cx"> // ...or a string #title, a little more complicated
</span><span class="cx"> $title = preg_replace('/[^a-z0-9]/i', '.', $urltest['fragment']);
</span><del>- $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", $title);
</del><ins>+ $sql = $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_title RLIKE %s", like_escape( $title ) );
</ins><span class="cx"> if (! ($post_ID = $wpdb->get_var($sql)) ) {
</span><span class="cx"> // returning unknown error '0' is better than die()ing
</span><span class="cx"> return new IXR_Error(0, '');
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/comment.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_search_sql( $string, $cols ) {
</span><del>- $string = esc_sql( $string );
</del><ins>+ $string = esc_sql( like_escape( $string ) );
</ins><span class="cx">
</span><span class="cx"> $searches = array();
</span><span class="cx"> foreach ( $cols as $col )
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/functions.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -1206,7 +1206,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $pung as $link_test ) {
</span><span class="cx"> if ( !in_array( $link_test, $post_links_temp[0] ) ) { // link no longer in post
</span><del>- $mid = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $link_test . '%') );
</del><ins>+ $mid = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $link_test ) . '%') );
</ins><span class="cx"> do_action( 'delete_postmeta', $mid );
</span><span class="cx"> $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->postmeta WHERE meta_id IN(%s)", implode( ',', $mid ) ) );
</span><span class="cx"> do_action( 'deleted_postmeta', $mid );
</span><span class="lines">@@ -1226,7 +1226,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> foreach ( (array) $post_links as $url ) {
</span><del>- if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, $url . '%' ) ) ) {
</del><ins>+ if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE (%s)", $post_ID, like_escape( $url ) . '%' ) ) ) {
</ins><span class="cx">
</span><span class="cx"> if ( $headers = wp_get_http_headers( $url) ) {
</span><span class="cx"> $len = (int) $headers['content-length'];
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/query.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -2045,11 +2045,11 @@
</span><span class="cx"> $n = !empty($q['exact']) ? '' : '%';
</span><span class="cx"> $searchand = '';
</span><span class="cx"> foreach( (array) $q['search_terms'] as $term ) {
</span><del>- $term = addslashes_gpc($term);
</del><ins>+ $term = esc_sql( like_escape( $term ) );
</ins><span class="cx"> $search .= "{$searchand}(($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}'))";
</span><span class="cx"> $searchand = ' AND ';
</span><span class="cx"> }
</span><del>- $term = esc_sql($q['s']);
</del><ins>+ $term = esc_sql( like_escape( $q['s'] ) );
</ins><span class="cx"> if ( empty($q['sentence']) && count($q['search_terms']) > 1 && $q['search_terms'][0] != $q['s'] )
</span><span class="cx"> $search .= " OR ($wpdb->posts.post_title LIKE '{$n}{$term}{$n}') OR ($wpdb->posts.post_content LIKE '{$n}{$term}{$n}')";
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (16998 => 16999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-12-16 13:09:16 UTC (rev 16998)
+++ trunk/wp-includes/taxonomy.php 2010-12-16 14:22:41 UTC (rev 16999)
</span><span class="lines">@@ -1237,7 +1237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( !empty($name__like) )
</span><del>- $where .= " AND t.name LIKE '{$name__like}%'";
</del><ins>+ $where .= " AND t.name LIKE '" . like_escape( $name__like ) . "%'";
</ins><span class="cx">
</span><span class="cx"> if ( '' !== $parent ) {
</span><span class="cx"> $parent = (int) $parent;
</span></span></pre>
</div>
</div>
</body>
</html>