Ticket #10041: 10041.3.diff

Index: wp-includes/taxonomy.php
===================================================================
--- wp-includes/taxonomy.php    (revision 13499)
+++ wp-includes/taxonomy.php    (working copy)
@@ -866,7 +866,7 @@
        }
 
        if ( !empty($search) ) {
-               $search = like_escape($search);
+               $search = like_escape(stripslashes($search));
                $where .= " AND (t.name LIKE '%$search%')";
        }
 
Index: wp-includes/bookmark.php
===================================================================
--- wp-includes/bookmark.php    (revision 13499)
+++ wp-includes/bookmark.php    (working copy)
@@ -181,7 +181,7 @@
        }
 
        if ( ! empty($search) ) {
-               $search = like_escape($search);
+               $search = like_escape(stripslashes($search));
                $search = " AND ( (link_url LIKE '%$search%') OR (link_name LIKE '%$search%') OR (link_description LIKE '%$search%') ) ";
        }
 
Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php  (revision 13499)
+++ wp-includes/formatting.php  (working copy)
@@ -2329,7 +2329,7 @@
  * @return string text, safe for inclusion in LIKE query.
  */
 function like_escape($text) {
-       return str_replace(array("%", "_"), array("\\%", "\\_"), $text);
+       return esc_sql(addcslashes($text, '_%\\'));
 }
 
 /**