Changeset 7016

Timestamp:

05/08/2013 12:29:59 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Remove calls to trim() introduced in r7014 to still allow searching for beginning or ending spaces. See #4989.

Location:

branches/1.7

Files:

• bp-core/bp-core-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (4 diffs)

branches/1.7/bp-core/bp-core-classes.php

@@ -837 +837 @@
 
         if ( !empty( $search_terms ) && bp_is_active( 'xprofile' ) ) {
-            $search_terms             = esc_sql( like_escape( trim( $search_terms ) ) );
+            $search_terms             = esc_sql( like_escape( $search_terms ) );
             $sql['where_searchterms'] = "AND spd.value LIKE '%%$search_terms%%'";
         }
@@ -954 +954 @@
         }
 
-        $letter     = esc_sql( like_escape( trim( $letter ) ) );
+        $letter     = esc_sql( like_escape( $letter ) );
         $status_sql = bp_core_get_status_sql( 'u.' );
 
@@ -1052 +1052 @@
         $pag_sql  = $limit && $page ? $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * intval( $limit ) ), intval( $limit ) ) : '';
 
-        $search_terms = esc_sql( like_escape( trim( $search_terms ) ) );
+        $search_terms = esc_sql( like_escape( $search_terms ) );
         $status_sql   = bp_core_get_status_sql( 'u.' );
 

branches/1.7/bp-groups/bp-groups-classes.php

@@ -479 +479 @@
 
         if ( !empty( $search_terms ) ) {
-            $search_terms = esc_sql( like_escape( trim( $search_terms ) ) );
+            $search_terms = esc_sql( like_escape( $search_terms ) );
             $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
         }
@@ -521 +521 @@
 
         if ( !empty( $search_terms ) ) {
-            $search_terms = esc_sql( like_escape( trim( $search_terms ) ) );
+            $search_terms = esc_sql( like_escape( $search_terms ) );
             $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
         }
@@ -604 +604 @@
 
         if ( !empty( $search_terms ) ) {
-            $search_terms = esc_sql( like_escape( trim( $search_terms ) ) );
+            $search_terms = esc_sql( like_escape( $search_terms ) );
             $search_sql = " AND ( g.name LIKE '%%{$search_terms}%%' OR g.description LIKE '%%{$search_terms}%%' )";
         }
@@ -1049 +1049 @@
 
         if ( !empty( $filter ) ) {
-            $filter     = esc_sql( like_escape( trim( $filter ) ) );
+            $filter     = esc_sql( like_escape( $filter ) );
             $filter_sql = " AND ( g.name LIKE '%%{$filter}%%' OR g.description LIKE '%%{$filter}%%' )";
         }