Changeset 2047

Timestamp:

10/22/2009 12:01:36 PM (17 years ago)

Author:

apeatling

Message:

Fixes #1223

Location:

branches/1.1

Files:

• bp-blogs/bp-blogs-classes.php (modified) (2 diffs)
• bp-core.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (2 diffs)
• bp-friends/bp-friends-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-classes.php (modified) (9 diffs)

branches/1.1/bp-blogs/bp-blogs-classes.php

@@ -181 +181 @@
                         bp_blogs_setup_globals();
                 
-                like_escape($letter);
+                like_escape( $wpdb->escape( $letter ) );
                                 
                 if ( $limit && $page ) {
@@ -199 +199 @@
                         bp_blogs_setup_globals();
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page ) {

branches/1.1/bp-core.php

@@ -66 +66 @@
 if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
         define( 'BP_HOME_BLOG_SLUG', 'blog' );
+        
+/* Register BuddyPress themes contained within the theme folder */
+if ( function_exists( 'register_theme_folder' ) )
+        register_theme_folder( 'buddypress/bp-themes' );
 
 

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

@@ -220 +220 @@
                         return false;
                 
-                like_escape($letter);
+                like_escape( $wpdb->escape( $letter ) );
 
                 $total_users_sql = apply_filters( 'bp_core_users_by_letter_count_sql', $wpdb->prepare( "SELECT DISTINCT count(u.ID) FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id LEFT JOIN {$bp->profile->table_name_fields} pf ON pd.field_id = pf.id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pf.name = %s AND pd.value LIKE '$letter%%' ORDER BY pd.value ASC", BP_XPROFILE_FULLNAME_FIELD_NAME ), $letter );
@@ -240 +240 @@
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
                 
-                like_escape($search_terms);     
+                like_escape( $wpdb->escape( $search_terms ) );  
 
                 $total_users_sql = apply_filters( 'bp_core_search_users_count_sql', "SELECT DISTINCT count(u.ID) as user_id FROM " . CUSTOM_USER_TABLE . " u LEFT JOIN {$bp->profile->table_name_data} pd ON u.ID = pd.user_id WHERE u.spam = 0 AND u.deleted = 0 AND u.user_status = 0 AND pd.value LIKE '%%$search_terms%%' ORDER BY pd.value ASC", $search_terms );

branches/1.1/bp-friends/bp-friends-classes.php

@@ -150 +150 @@
                         $user_id = $bp->loggedin_user->id;
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page )
@@ -222 +222 @@
                 global $wpdb, $bp;
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 $usermeta_table = $wpdb->base_prefix . 'usermeta';
                 $users_table = $wpdb->base_prefix . 'users';
@@ -247 +247 @@
                 global $wpdb, $bp;
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 $usermeta_table = $wpdb->prefix . 'usermeta';
                 $users_table = $wpdb->base_prefix . 'users';

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

@@ -247 +247 @@
                         $user_id = $bp->displayed_user->id;
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page )
@@ -269 +269 @@
                 global $wpdb, $bp;
                 
-                like_escape($filter);
+                like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page )
@@ -463 +463 @@
                         $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
                 
-                like_escape($letter);
+                like_escape( $wpdb->escape( $letter ) );
                                 
                 if ( $limit && $page ) {
@@ -699 +699 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }
@@ -719 +719 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }
@@ -739 +739 @@
                         
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }
@@ -759 +759 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }
@@ -779 +779 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }
@@ -799 +799 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }