Changeset 7017

Timestamp:

05/08/2013 12:34:37 AM (13 years ago)

Author:

johnjamesjacoby

Message:

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

Location:

trunk

Files:

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

trunk/bp-core/bp-core-classes.php

@@ -839 +839 @@
 
                 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%%'";
                 }
@@ -956 +956 @@
                 }
 
-                $letter     = esc_sql( like_escape( trim( $letter ) ) );
+                $letter     = esc_sql( like_escape( $letter ) );
                 $status_sql = bp_core_get_status_sql( 'u.' );
 
@@ -1054 +1054 @@
                 $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.' );
 

trunk/bp-groups/bp-groups-classes.php

@@ -543 +543 @@
 
                 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}%%' )";
                 }
@@ -585 +585 @@
 
                 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}%%' )";
                 }
@@ -668 +668 @@
 
                 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}%%' )";
                 }
@@ -1113 +1113 @@
 
                 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}%%' )";
                 }