Changes from tags/1.1.1 at r2062 to tags/1.1.2 at r2062

Location:

tags/1.1.2

Files:

• bp-themes/bp-default/style.css (modified) (1 diff)
• bp-themes/bp-sn-parent/style.css (modified) (1 diff)
• bp-themes/bp-sn-parent/wire/post-list.php (modified) (1 diff)
• bp-themes/bp-sn-parent/wire/post-form.php (modified) (1 diff)
• bp-themes/bp-sn-parent/_inc/js/ajax.js (modified) (4 diffs)
• bp-core/bp-core-signup.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (2 diffs)
• bp-core/bp-core-settings.php (modified) (1 diff)
• bp-xprofile/deprecated/bp-xprofile-deprecated.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-templatetags.php (modified) (1 diff)
• bp-friends/bp-friends-classes.php (modified) (3 diffs)
• bp-loader.php (modified) (1 diff)
• bp-blogs.php (modified) (8 diffs)
• bp-activity/bp-activity-filters.php (modified) (1 diff)
• bp-activity/bp-activity-templatetags.php (modified) (3 diffs)
• bp-blogs/bp-blogs-classes.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)
• bp-core.php (modified) (4 diffs)
• bp-xprofile.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (9 diffs)
• bp-groups/bp-groups-templatetags.php (modified) (2 diffs)

tags/1.1.2/bp-themes/bp-default/style.css

@@ -3 +3 @@
 Theme URI: http://buddypress.org/extend/themes/
 Description: The default theme for BuddyPress.
-Version: 1.1.1
+Version: 1.1.2
 Author: BuddyPress.org
 Author URI: http://buddypress.org

tags/1.1.2/bp-themes/bp-sn-parent/style.css

@@ -3 +3 @@
 Theme URI: http://buddypress.org/extend/themes/
 Description: The social network parent theme for BuddyPress. This theme should not be activated and used directly. BuddyPress themes can be downloaded at: <a href="http://buddypress.org/extend/themes/">http://buddypress.org/extend/themes/</a>
-Version: 1.1.1
+Version: 1.1.2
 Author: BuddyPress.org
 Author URI: http://buddypress.org

tags/1.1.2/bp-themes/bp-sn-parent/wire/post-list.php

@@ -59 +59 @@
                 
                 <?php do_action( 'bp_after_wire_post_list' ) ?>
-        
+
+                <input type="hidden" name="bp_wire_item_id" id="bp_wire_item_id" value="<?php echo bp_get_wire_item_id() ?>" /> 
         </div>
         <?php else: ?>

tags/1.1.2/bp-themes/bp-sn-parent/wire/post-form.php

@@ -38 +38 @@
                         
                         <input type="submit" name="wire-post-submit" id="wire-post-submit" value="<?php _e( 'Post &raquo;', 'buddypress' ) ?>" />
-                        <input type="hidden" name="bp_wire_item_id" id="bp_wire_item_id" value="<?php echo bp_get_wire_item_id() ?>" />
 
                         <?php wp_nonce_field( 'bp_wire_post' ) ?>

tags/1.1.2/bp-themes/bp-sn-parent/_inc/js/ajax.js

@@ -79 +79 @@
                         page = page.split('upage=');
                         
-                        if ( !j("input#selected_letter").val() )
+                        if ( undefined === j("input#selected_letter").val() )
                                 var letter = '';
                         else
                                 var letter = j("input#selected_letter").val();
                                                 
-                        if ( !j("input#search_terms").val() )
+                        if ( undefined === j("input#search_terms").val() )
                                 var search_terms = '';
                         else
@@ -333 +333 @@
                         page = page.split('gpage=');
                         
-                        if ( !j("input#selected_letter").val() )
+                        if ( undefined === j("input#selected_letter").val() )
                                 var letter = '';
                         else
                                 var letter = j("input#selected_letter").val();
                                                 
-                        if ( !j("input#search_terms").val() )
+                        if ( undefined === j("input#search_terms").val() )
                                 var search_terms = '';
                         else
@@ -973 +973 @@
         );
 
-        j("form#status-update-form").livequery('submit', 
-                function() {
-                        j.post( ajaxurl, {
-                                action: 'status_new_status',
-                                'cookie': encodeURIComponent(document.cookie),
-                                '_wpnonce': j('input#_wpnonce_add_status').val(),
-                                'status-update-input': j('#status-update-input').val()
-                        },
-                        function(response) {
-                                if ( response == "1" ) {                        
-                                        j("div#user-status").slideUp(400,
-                                                function() {
-                                                        j.post( ajaxurl, {
-                                                                action: 'status_show_status',
-                                                                'cookie': encodeURIComponent(document.cookie)
-                                                        },
-                                                        function(response) {                            
-                                                                j("div#user-status").html(response);
-                                                                j("div#user-status").slideDown(400);
-                                                                j(window).unbind('click');
-                                                        });
-                                                } 
-                                        );
-                                }
-                        });
-
-                        return false;
-                }
-        );
-
         j("a#status-clear-status").livequery('click', 
                 function() {
@@ -1094 +1064 @@
                         page = page.split('bpage=');
                         
-                        if ( !j("input#selected_letter").val() )
+                        if ( undefined === j("input#selected_letter").val() )
                                 var letter = '';
                         else
                                 var letter = j("input#selected_letter").val();
                                                 
-                        if ( !j("input#search_terms").val() )
+                        if ( undefined === j("input#search_terms").val() )
                                 var search_terms = '';
                         else

tags/1.1.2/bp-core/bp-core-signup.php

@@ -117 +117 @@
                                 if ( 'blog' == $active_signup || 'all' == $active_signup ) {
                                         $usermeta['public'] = ( 'public' == $_POST['signup_blog_privacy'] ) ? true : false;
-                                        $usermeta['blogname'] = $_POST['signup_blog_url'];
-                                        $usermeta['blog_title'] = $_POST['signup_blog_title'];
                                 }
                                 

tags/1.1.2/bp-core/bp-core-classes.php

@@ -220 +220 @@
                         return false;
                 
-                like_escape($letter);
+                $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);     
+                $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 );

tags/1.1.2/bp-core/bp-core-settings.php

@@ -154 +154 @@
 /**** DELETE ACCOUNT ****/
 
-function bp_core_screen_delete_account() {
-        global $current_user, $bp_settings_updated, $pass_error;
-        
-        if ( isset( $_POST['delete-account-button'] ) ) {
+function bp_core_screen_delete_account() {      
+        if ( isset( $_POST['delete-account-understand'] ) ) {
                 check_admin_referer( 'delete-account' );
-                
+
                 // delete the users account
                 if ( bp_core_delete_account() )
                         bp_core_redirect( site_url() );
-        }
-        
-        $bp_settings_updated = false;
-        $pass_error = false;
-        
-        if ( isset($_POST['submit']) ) {
-                check_admin_referer('bp_settings_general');
-                
-                require_once( WPINC . '/registration.php' );
-                
-                // Form has been submitted and nonce checks out, lets do it.
-                
-                if ( $_POST['email'] != '' ) {
-                        $current_user->user_email = wp_specialchars( trim( $_POST['email'] ));
-                }
-
-                if ( $_POST['pass1'] != '' && $_POST['pass2'] != '' ) {
-                        if ( $_POST['pass1'] == $_POST['pass2'] && !strpos( " " . $_POST['pass1'], "\\" ) ) {
-                                $current_user->user_pass = $_POST['pass1'];
-                        } else {
-                                $pass_error = true;
-                        }
-                } else if ( empty( $_POST['pass1'] ) && !empty( $_POST['pass2'] ) || !empty( $_POST['pass1'] ) && empty( $_POST['pass2'] ) ) {
-                        $pass_error = true;
-                } else {
-                        unset( $current_user->user_pass );
-                }
-                
-                if ( !$pass_error && wp_update_user( get_object_vars( $current_user ) ) )
-                        $bp_settings_updated = true;
         }
         

tags/1.1.2/bp-xprofile/deprecated/bp-xprofile-deprecated.php

@@ -677 +677 @@
                 'public' => $_POST['blog_public'],
                 'lang_id' => 1, // deprecated
-                'blogname' => $_POST['blogname'],
-                'blog_title' => $_POST['blog_title']
         );
         

tags/1.1.2/bp-xprofile/bp-xprofile-templatetags.php

@@ -470 +470 @@
                         
                         case 'datebox':
-                        
-                                if ( $field->data->value != '' ) {
+
+                                if ( !empty( $field->data->value ) ) {
                                         $day = date("j", $field->data->value);
                                         $month = date("F", $field->data->value);

tags/1.1.2/bp-friends/bp-friends-classes.php

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

tags/1.1.2/bp-loader.php

@@ -5 +5 @@
 Description: BuddyPress will add social networking features to a new or existing WordPress MU installation.
 Author: The BuddyPress Community
-Version: 1.1.1
+Version: 1.1.2
 Author URI: http://buddypress.org/developers/
 Site Wide Only: true
 */
 
-define( 'BP_VERSION', '1.1.1' );
+define( 'BP_VERSION', '1.1.2' );
 
 /***

tags/1.1.2/bp-blogs.php

@@ -309 +309 @@
 }
 
-function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = false ) {
+function bp_blogs_record_blog( $blog_id, $user_id, $no_activity = true ) {
         global $bp;
         
@@ -329 +329 @@
         
         /* Only record this activity if the blog is public */
-        if ( (int)$_POST['blog_public'] && !$no_activity ) {    
+        if ( (int)$_POST['blog_public'] || !$no_activity ) {
                 /* Record this in activity streams */
                 bp_blogs_record_activity( array(
@@ -352 +352 @@
         if ( !$user_id )
                 $user_id = (int)$post->post_author;
-
         
         /* This is to stop infinate loops with Donncha's sitewide tags plugin */
-        if ( (int)get_site_option('tags_blog_id') == (int)$blog_id )
+        if ( (int)get_site_option( 'tags_blog_id' ) == (int)$blog_id )
                 return false;
         
@@ -375 +374 @@
                         bp_blogs_update_blogmeta( $recorded_post->blog_id, 'last_activity', time() );
 
-                        $post_permalink = bp_post_get_permalink( $post, $blog_id );
-
-                        $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-                        $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+                        if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
+                                /* Record this in activity streams */
+                                $post_permalink = bp_post_get_permalink( $post, $blog_id );
+
+                                $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                                $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
                         
-                        /* Record this in activity streams */
-                        bp_blogs_record_activity( array(
-                                'user_id' => (int)$post->post_author,
-                                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
-                                'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
-                                'component_action' => 'new_blog_post',
-                                'item_id' => $recorded_post_id,
-                                'recorded_time' => strtotime( $post->post_date )
-                        ) );
+                                bp_blogs_record_activity( array(
+                                        'user_id' => (int)$post->post_author,
+                                        'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
+                                        'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
+                                        'component_action' => 'new_blog_post',
+                                        'item_id' => $recorded_post_id,
+                                        'recorded_time' => strtotime( $post->post_date )
+                                ));
+                        }
                 }
         } else {
@@ -408 +409 @@
                         bp_blogs_record_post( $post_id );                               
                 }
-                
-                /* Now re-record the post in the activity streams */            
-                $post_permalink = bp_post_get_permalink( $post, $blog_id );
-                
-
-                $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
-                $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
-                
-                /* Record this in activity streams */
-                bp_blogs_record_activity( array(
-                        'user_id' => (int)$post->post_author,
-                        'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
-                        'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
-                        'component_action' => 'new_blog_post',
-                        'item_id' => $existing_post->id,
-                        'recorded_time' => strtotime( $post->post_date )
-                ) );
+
+                if ( (int)get_blog_option( $blog_id, 'blog_public' ) ) {
+                        /* Now re-record the post in the activity streams */            
+                        $post_permalink = bp_post_get_permalink( $post, $blog_id );
+
+                        $activity_content = sprintf( __( '%s wrote a new blog post: %s', 'buddypress' ), bp_core_get_userlink( (int)$post->post_author ), '<a href="' . $post_permalink . '">' . $post->post_title . '</a>' );
+                        $activity_content .= "<blockquote>" . bp_create_excerpt( $post->post_content ) . "</blockquote>";
+                
+                        /* Record this in activity streams */
+                        bp_blogs_record_activity( array(
+                                'user_id' => (int)$post->post_author,
+                                'content' => apply_filters( 'bp_blogs_activity_new_post', $activity_content, &$post, $post_permalink ), 
+                                'primary_link' => apply_filters( 'bp_blogs_activity_new_post_primary_link', $post_permalink, $post_id ),
+                                'component_action' => 'new_blog_post',
+                                'item_id' => $existing_post->id,
+                                'recorded_time' => strtotime( $post->post_date )
+                        ) );
+                }
         }
 
@@ -458 +460 @@
         bp_blogs_update_blogmeta( $recorded_comment->blog_id, 'last_activity', time() );
 
-        $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                 
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
-
-        /* Record this in activity streams */
-        bp_blogs_record_activity( array(
-                'user_id' => $recorded_comment->user_id,
-                'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
-                'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
-                'component_action' => 'new_blog_comment',
-                'item_id' => $comment_id,
-                'secondary_item_id' => $recorded_comment->blog_id,
-                'recorded_time' =>  $recorded_comment->date_created
-        ) );
-        
+        if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) ) {
+                /* Record in activity streams */
+                $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
+                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                 
+                $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
+
+                /* Record this in activity streams */
+                bp_blogs_record_activity( array(
+                        'user_id' => $recorded_comment->user_id,
+                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
+                        'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
+                        'component_action' => 'new_blog_comment',
+                        'item_id' => $comment_id,
+                        'secondary_item_id' => $recorded_comment->blog_id,
+                        'recorded_time' =>  $recorded_comment->date_created
+                ) );
+        }
+
         return $recorded_comment;
 }
@@ -489 +494 @@
         bp_blogs_delete_activity( array( 'item_id' => $comment_id, 'secondary_item_id' => $recorded_comment->blog_id, 'component_name' => $bp->blogs->slug, 'component_action' => 'new_blog_comment' ) );
 
-        $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
-        $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                       
-        $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
-
-        /* Record this in activity streams */
-        bp_blogs_record_activity( array(
-                'user_id' => $recorded_comment->user_id,
-                'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
-                'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
-                'component_action' => 'new_blog_comment',
-                'item_id' => $comment_id,
-                'secondary_item_id' => $recorded_comment->blog_id,
-                'recorded_time' =>  $recorded_comment->date_created 
-        ) );
+        if ( (int)get_blog_option( $recorded_comment->blog_id, 'blog_public' ) ) {
+                /* Record in activity streams */
+                $comment_link = bp_post_get_permalink( $comment->post, $recorded_comment->blog_id );
+                $activity_content = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $recorded_comment->user_id ), '<a href="' . $comment_link . '#comment-' . $comment->comment_ID . '">' . $comment->post->post_title . '</a>' );                       
+                $activity_content .= '<blockquote>' . bp_create_excerpt( $comment->comment_content ) . '</blockquote>';
+
+                /* Record this in activity streams */
+                bp_blogs_record_activity( array(
+                        'user_id' => $recorded_comment->user_id,
+                        'content' => apply_filters( 'bp_blogs_activity_new_comment', $activity_content, &$comment, &$recorded_comment, $comment_link ), 
+                        'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$comment, &$recorded_comment ),
+                        'component_action' => 'new_blog_comment',
+                        'item_id' => $comment_id,
+                        'secondary_item_id' => $recorded_comment->blog_id,
+                        'recorded_time' =>  $recorded_comment->date_created 
+                ) );
+        }
 }
 add_action( 'wp_set_comment_status', 'bp_blogs_approve_comment', 10, 2 );
@@ -514 +522 @@
 function bp_blogs_add_user_to_blog( $user_id, $role, $blog_id ) {
         if ( $role != 'subscriber' ) {
-                bp_blogs_record_blog( $blog_id, $user_id, $no_activity = true );
+                bp_blogs_record_blog( $blog_id, $user_id );
         }
 }

tags/1.1.2/bp-activity/bp-activity-filters.php

@@ -3 +3 @@
 /* Apply WordPress defined filters */
 add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
+add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
+
 add_filter( 'bp_get_activity_content', 'force_balance_tags' );
 add_filter( 'bp_get_activity_content', 'wptexturize' );

tags/1.1.2/bp-activity/bp-activity-templatetags.php

@@ -352 +352 @@
                         else
                                 unset($selected);
+                        
+                        $component_name = attribute_escape( $component_name );
 
                         switch ( $style ) {
@@ -379 +381 @@
                         $translatable_component_names = array( __( 'profile', 'buddypress'), __( 'friends', 'buddypress' ), __( 'groups', 'buddypress' ), __( 'status', 'buddypress' ), __( 'blogs', 'buddypress' ) );
                         
-                        $component_links[] = $before . '<a href="' . $link . '">' . ucwords( __( $component_name, 'buddypress' ) ) . '</a>' . $after;
+                        $component_links[] = $before . '<a href="' . attribute_escape( $link ) . '">' . ucwords( __( $component_name, 'buddypress' ) ) . '</a>' . $after;
                 }
 
@@ -385 +387 @@
 
                 if ( isset( $_GET['afilter'] ) )
-                        $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . $link . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
+                        $component_links[] = '<' . $tag . ' id="afilter-clear"><a href="' . attribute_escape( $link ) . '"">' . __( 'Clear Filter', 'buddypress' ) . '</a></' . $tag . '>';
                 
                 return apply_filters( 'bp_get_activity_filter_links', implode( "\n", $component_links ) );

tags/1.1.2/bp-blogs/bp-blogs-classes.php

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

tags/1.1.2/readme.txt

@@ -4 +4 @@
 Requires at least: WordPress MU 2.8.4
 Tested up to: WordPress MU 2.8.4
-Stable tag: 1.1.1
+Stable tag: 1.1.2
 
 BuddyPress is a suite of WordPress MU social networking plugins and themes.

tags/1.1.2/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' );
 
 
@@ -626 +630 @@
         );
 
+        /***
+         * If this nav item is hidden for the displayed user, and
+         * the logged in user is not the displayed user
+         * looking at their own profile, don't create the nav item.
+         */
+        if ( !$show_for_displayed_user && !bp_is_home() )
+                return false;
+                
         /***
-         * If we are not viewing a user, and this is a root component, don't attach the
-         * default subnav function so we can display a directory or something else.
-         */
+         * If we are not viewing a user, and this is a root component, don't attach the
+         * default subnav function so we can display a directory or something else.
+         */
         if ( bp_core_is_root_component( $slug ) && !$bp->displayed_user->id )
                 return;
@@ -1534 +1546 @@
 
         /* Make sure account deletion is not disabled */
-        if ( ( !(int) get_site_option( 'bp-disable-account-deletion' ) && !is_site_admin() ) )
+        if ( ( '' != get_site_option( 'bp-disable-account-deletion' ) || (int) get_site_option( 'bp-disable-account-deletion' ) ) && !is_site_admin() )
                 return false;
 
@@ -1704 +1716 @@
 }
 
+/**
+ * bp_core_boot_spammer()
+ *
+ * When a user logs in, check if they have been marked as a spammer. If then simply
+ * redirect them to the home page and stop them from logging in.
+ * 
+ * @package BuddyPress Core
+ * @param $username The username of the user
+ * @uses delete_usermeta() deletes a row from the wp_usermeta table based on meta_key
+ */
+function bp_core_boot_spammer( $auth_obj, $username ) {
+        global $bp;
+        
+        $user = get_userdatabylogin( $username );
+
+        if ( (int)$user->spam )
+                bp_core_redirect( $bp->root_domain );
+}
+add_filter( 'authenticate', 'bp_core_boot_spammer', 11, 2 );
 
 /**

tags/1.1.2/bp-xprofile.php

@@ -328 +328 @@
                 /* Loop through the posted fields formatting any datebox values then validate the field */
                 foreach ( $posted_field_ids as $field_id ) {            
-                        
+
                         if ( !isset( $_POST['field_' . $field_id] ) ) {
-                                
-                                if ( isset( $_POST['field_' . $field_id . '_day'] ) ) {
+
+                                if ( is_numeric( $_POST['field_' . $field_id . '_day'] ) ) {
                                         /* Concatenate the values. */
                                         $date_value = $_POST['field_' . $field_id . '_day'] . ' ' .  
                                                               $_POST['field_' . $field_id . '_month'] . ' ' .
                                                                   $_POST['field_' . $field_id . '_year'];
-                                                
+
                                         /* Turn the concatenated value into a timestamp */
                                         $_POST['field_' . $field_id] = strtotime( $date_value );
                                 }
-                                
+
                         }
-                        
+
                         if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
                                 $errors = true;
                 }
-                
+
                 if ( $errors )
                         bp_core_add_message( __( 'Please make sure you fill in all required fields in this profile field group before saving.', 'buddypress' ), 'error' );                      

tags/1.1.2/bp-groups/bp-groups-classes.php

@@ -247 +247 @@
                         $user_id = $bp->displayed_user->id;
                 
-                like_escape($filter);
+                $filter = like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page )
@@ -269 +269 @@
                 global $wpdb, $bp;
                 
-                like_escape($filter);
+                $filter = like_escape( $wpdb->escape( $filter ) );
                 
                 if ( $limit && $page )
@@ -463 +463 @@
                         $hidden_sql = $wpdb->prepare( " AND status != 'hidden'");
                 
-                like_escape($letter);
-                                
+                $letter = like_escape( $wpdb->escape( $letter ) );
+
                 if ( $limit && $page ) {
                         $pag_sql = $wpdb->prepare( " LIMIT %d, %d", intval( ( $page - 1 ) * $limit), intval( $limit ) );
@@ -699 +699 @@
 
                 if ( $filter ) {
-                        like_escape($filter);
+                        $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);
+                        $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);
+                        $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);
+                        $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);
+                        $filter = like_escape( $wpdb->escape( $filter ) );
                         $filter_sql = " AND ( g.name LIKE '{$filter}%%' OR g.description LIKE '{$filter}%%' )";                 
                 }

tags/1.1.2/bp-groups/bp-groups-templatetags.php

@@ -1650 +1650 @@
         function bp_get_new_group_description() {
                 global $bp;
-                return apply_filters( 'bp_get_new_group_description', $bp->groups->current_group->name );
+                return apply_filters( 'bp_get_new_group_description', $bp->groups->current_group->description );
         }
 
@@ -1658 +1658 @@
         function bp_get_new_group_news() {
                 global $bp;
-                return apply_filters( 'bp_get_new_group_news', $bp->groups->current_group->name );
+                return apply_filters( 'bp_get_new_group_news', $bp->groups->current_group->news );
         }