BuddyPress - Version 1.6.5

Version Description

= 1.6.4 = See: http://codex.buddypress.org/releases/version-1-6-4/

= 1.6.3 = See: http://codex.buddypress.org/releases/version-1-6-3/

= 1.6.2 = Compatibility with WordPress 3.5

= 1.6.1 = Fixes 4 bugs

= 1.6 = See: http://codex.buddypress.org/releases/version-1-6/

= 1.5 = See: http://codex.buddypress.org/releases/version-1-5/

= 1.2.9 = Compatibility with WordPress 3.2

= 1.2.8 = Compatibility with WordPress 3.1

= 1.2.7 = Fixes over 10 bugs.

Download this release

Release Info

Developer johnjamesjacoby
Plugin Icon 128x128 BuddyPress
Version 1.6.5
Comparing to
See all releases

Code changes from version 1.6.4 to 1.6.5

Files changed (8) hide show
  1. bp-core/bp-core-cache.php +3 -2
  2. bp-languages/buddypress.pot +26 -24
  3. bp-loader.php +2 -2
  4. bp-members/bp-members-functions.php +11 -2
  5. bp-settings/bp-settings-loader.php +2 -2
  6. bp-themes/bp-default/rtl.css +1 -1
  7. bp-themes/bp-default/style.css +1 -1
  8. readme.txt +1 -1
bp-core/bp-core-cache.php CHANGED
@@ -30,8 +30,9 @@ function bp_core_clear_cache() {
30
  * @package BuddyPress Core
31
  */
32
  function bp_core_add_global_group() {
33
- wp_cache_init();
34
- wp_cache_add_global_groups( array( 'bp' ) );
 
35
  }
36
  add_action( 'bp_loaded', 'bp_core_add_global_group' );
37
 
30
  * @package BuddyPress Core
31
  */
32
  function bp_core_add_global_group() {
33
+ if ( function_exists( 'wp_cache_add_global_groups' ) ) {
34
+ wp_cache_add_global_groups( array( 'bp' ) );
35
+ }
36
  }
37
  add_action( 'bp_loaded', 'bp_core_add_global_group' );
38
 
bp-languages/buddypress.pot CHANGED
@@ -4,7 +4,7 @@ msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
- "POT-Creation-Date: 2013-01-06 19:36:53+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -276,6 +276,8 @@ msgstr ""
276
  msgid "Errors occurred when trying to update these activity items:"
277
  msgstr ""
278
 
 
 
279
  #: bp-activity/bp-activity-admin.php:804
280
  msgid "#%s"
281
  msgstr ""
@@ -2415,7 +2417,7 @@ msgstr ""
2415
  msgid "You already have a pending friendship request with this user"
2416
  msgstr ""
2417
 
2418
- #: bp-friends/bp-friends-actions.php:70 bp-themes/bp-default/_inc/ajax.php:601
2419
  msgid "Friendship could not be canceled."
2420
  msgstr ""
2421
 
@@ -2589,7 +2591,7 @@ msgid "%d friends"
2589
  msgstr ""
2590
 
2591
  #: bp-friends/bp-friends-template.php:285
2592
- #: bp-themes/bp-default/_inc/ajax.php:611
2593
  msgid "Cancel Friendship Request"
2594
  msgstr ""
2595
 
@@ -2604,8 +2606,8 @@ msgstr ""
2604
 
2605
  #: bp-friends/bp-friends-template.php:319
2606
  #: bp-friends/bp-friends-template.php:320
2607
- #: bp-themes/bp-default/_inc/ajax.php:603
2608
- #: bp-themes/bp-default/_inc/ajax.php:617
2609
  msgid "Add Friend"
2610
  msgstr ""
2611
 
@@ -2848,7 +2850,7 @@ msgid "Home"
2848
  msgstr ""
2849
 
2850
  #: bp-groups/bp-groups-loader.php:412 bp-groups/bp-groups-template.php:1580
2851
- #: bp-groups/bp-groups-template.php:1581 bp-themes/bp-default/_inc/ajax.php:709
2852
  msgid "Request Membership"
2853
  msgstr ""
2854
 
@@ -3299,12 +3301,12 @@ msgid "New Topic"
3299
  msgstr ""
3300
 
3301
  #: bp-groups/bp-groups-template.php:1539 bp-groups/bp-groups-template.php:1540
3302
- #: bp-themes/bp-default/_inc/ajax.php:690
3303
  msgid "Leave Group"
3304
  msgstr ""
3305
 
3306
  #: bp-groups/bp-groups-template.php:1562 bp-groups/bp-groups-template.php:1563
3307
- #: bp-themes/bp-default/_inc/ajax.php:707
3308
  msgid "Join Group"
3309
  msgstr ""
3310
 
@@ -3634,7 +3636,7 @@ msgid "There was an error deleting messages."
3634
  msgstr ""
3635
 
3636
  #: bp-messages/bp-messages-actions.php:110
3637
- #: bp-themes/bp-default/_inc/ajax.php:854
3638
  msgid "Messages deleted."
3639
  msgstr ""
3640
 
@@ -3839,7 +3841,7 @@ msgid "%d Recipients"
3839
  msgstr ""
3840
 
3841
  #: bp-messages/bp-messages-template.php:922
3842
- #: bp-themes/bp-default/_inc/ajax.php:761
3843
  msgid "Sent %s"
3844
  msgstr ""
3845
 
@@ -3941,59 +3943,59 @@ msgstr ""
3941
  msgid "Remove Invite"
3942
  msgstr ""
3943
 
3944
- #: bp-themes/bp-default/_inc/ajax.php:609
3945
  msgid " Friendship could not be requested."
3946
  msgstr ""
3947
 
3948
- #: bp-themes/bp-default/_inc/ajax.php:619
3949
  msgid "Friendship request could not be cancelled."
3950
  msgstr ""
3951
 
3952
- #: bp-themes/bp-default/_inc/ajax.php:622
3953
  msgid "Request Pending"
3954
  msgstr ""
3955
 
3956
- #: bp-themes/bp-default/_inc/ajax.php:642
3957
  msgid "There was a problem accepting that request. Please try again."
3958
  msgstr ""
3959
 
3960
- #: bp-themes/bp-default/_inc/ajax.php:661
3961
  msgid "There was a problem rejecting that request. Please try again."
3962
  msgstr ""
3963
 
3964
- #: bp-themes/bp-default/_inc/ajax.php:688
3965
  msgid "Error joining group"
3966
  msgstr ""
3967
 
3968
- #: bp-themes/bp-default/_inc/ajax.php:696
3969
  msgid "Error requesting membership"
3970
  msgstr ""
3971
 
3972
- #: bp-themes/bp-default/_inc/ajax.php:698
3973
  msgid "Membership Requested"
3974
  msgstr ""
3975
 
3976
- #: bp-themes/bp-default/_inc/ajax.php:705
3977
  msgid "Error leaving group"
3978
  msgstr ""
3979
 
3980
- #: bp-themes/bp-default/_inc/ajax.php:727
3981
  msgid "There was a problem closing the notice."
3982
  msgstr ""
3983
 
3984
- #: bp-themes/bp-default/_inc/ajax.php:778
3985
  msgid "There was a problem sending that reply. Please try again."
3986
  msgstr ""
3987
 
3988
- #: bp-themes/bp-default/_inc/ajax.php:796
3989
  msgid "There was a problem marking messages as unread."
3990
  msgstr ""
3991
 
3992
- #: bp-themes/bp-default/_inc/ajax.php:821
3993
  msgid "There was a problem marking messages as read."
3994
  msgstr ""
3995
 
3996
- #: bp-themes/bp-default/_inc/ajax.php:846
3997
  msgid "There was a problem deleting messages."
3998
  msgstr ""
3999
 
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2013-02-13 22:36:44+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
276
  msgid "Errors occurred when trying to update these activity items:"
277
  msgstr ""
278
 
279
+ #. Translators: This is a bulleted list of item IDs
280
+
281
  #: bp-activity/bp-activity-admin.php:804
282
  msgid "#%s"
283
  msgstr ""
2417
  msgid "You already have a pending friendship request with this user"
2418
  msgstr ""
2419
 
2420
+ #: bp-friends/bp-friends-actions.php:70 bp-themes/bp-default/_inc/ajax.php:605
2421
  msgid "Friendship could not be canceled."
2422
  msgstr ""
2423
 
2591
  msgstr ""
2592
 
2593
  #: bp-friends/bp-friends-template.php:285
2594
+ #: bp-themes/bp-default/_inc/ajax.php:617
2595
  msgid "Cancel Friendship Request"
2596
  msgstr ""
2597
 
2606
 
2607
  #: bp-friends/bp-friends-template.php:319
2608
  #: bp-friends/bp-friends-template.php:320
2609
+ #: bp-themes/bp-default/_inc/ajax.php:607
2610
+ #: bp-themes/bp-default/_inc/ajax.php:625
2611
  msgid "Add Friend"
2612
  msgstr ""
2613
 
2850
  msgstr ""
2851
 
2852
  #: bp-groups/bp-groups-loader.php:412 bp-groups/bp-groups-template.php:1580
2853
+ #: bp-groups/bp-groups-template.php:1581 bp-themes/bp-default/_inc/ajax.php:724
2854
  msgid "Request Membership"
2855
  msgstr ""
2856
 
3301
  msgstr ""
3302
 
3303
  #: bp-groups/bp-groups-template.php:1539 bp-groups/bp-groups-template.php:1540
3304
+ #: bp-themes/bp-default/_inc/ajax.php:703
3305
  msgid "Leave Group"
3306
  msgstr ""
3307
 
3308
  #: bp-groups/bp-groups-template.php:1562 bp-groups/bp-groups-template.php:1563
3309
+ #: bp-themes/bp-default/_inc/ajax.php:722
3310
  msgid "Join Group"
3311
  msgstr ""
3312
 
3636
  msgstr ""
3637
 
3638
  #: bp-messages/bp-messages-actions.php:110
3639
+ #: bp-themes/bp-default/_inc/ajax.php:871
3640
  msgid "Messages deleted."
3641
  msgstr ""
3642
 
3841
  msgstr ""
3842
 
3843
  #: bp-messages/bp-messages-template.php:922
3844
+ #: bp-themes/bp-default/_inc/ajax.php:777
3845
  msgid "Sent %s"
3846
  msgstr ""
3847
 
3943
  msgid "Remove Invite"
3944
  msgstr ""
3945
 
3946
+ #: bp-themes/bp-default/_inc/ajax.php:615
3947
  msgid " Friendship could not be requested."
3948
  msgstr ""
3949
 
3950
+ #: bp-themes/bp-default/_inc/ajax.php:627
3951
  msgid "Friendship request could not be cancelled."
3952
  msgstr ""
3953
 
3954
+ #: bp-themes/bp-default/_inc/ajax.php:632
3955
  msgid "Request Pending"
3956
  msgstr ""
3957
 
3958
+ #: bp-themes/bp-default/_inc/ajax.php:652
3959
  msgid "There was a problem accepting that request. Please try again."
3960
  msgstr ""
3961
 
3962
+ #: bp-themes/bp-default/_inc/ajax.php:671
3963
  msgid "There was a problem rejecting that request. Please try again."
3964
  msgstr ""
3965
 
3966
+ #: bp-themes/bp-default/_inc/ajax.php:701
3967
  msgid "Error joining group"
3968
  msgstr ""
3969
 
3970
+ #: bp-themes/bp-default/_inc/ajax.php:710
3971
  msgid "Error requesting membership"
3972
  msgstr ""
3973
 
3974
+ #: bp-themes/bp-default/_inc/ajax.php:712
3975
  msgid "Membership Requested"
3976
  msgstr ""
3977
 
3978
+ #: bp-themes/bp-default/_inc/ajax.php:720
3979
  msgid "Error leaving group"
3980
  msgstr ""
3981
 
3982
+ #: bp-themes/bp-default/_inc/ajax.php:743
3983
  msgid "There was a problem closing the notice."
3984
  msgstr ""
3985
 
3986
+ #: bp-themes/bp-default/_inc/ajax.php:794
3987
  msgid "There was a problem sending that reply. Please try again."
3988
  msgstr ""
3989
 
3990
+ #: bp-themes/bp-default/_inc/ajax.php:812
3991
  msgid "There was a problem marking messages as unread."
3992
  msgstr ""
3993
 
3994
+ #: bp-themes/bp-default/_inc/ajax.php:837
3995
  msgid "There was a problem marking messages as read."
3996
  msgstr ""
3997
 
3998
+ #: bp-themes/bp-default/_inc/ajax.php:862
3999
  msgid "There was a problem deleting messages."
4000
  msgstr ""
4001
 
bp-loader.php CHANGED
@@ -14,7 +14,7 @@
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
- * Version: 1.6.4
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
@@ -52,7 +52,7 @@ class BuddyPress {
52
  /**
53
  * @var string BuddyPress version
54
  */
55
- public $version = '1.6.4';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
+ * Version: 1.6.5
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
52
  /**
53
  * @var string BuddyPress version
54
  */
55
+ public $version = '1.6.5';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
bp-members/bp-members-functions.php CHANGED
@@ -782,17 +782,26 @@ function bp_core_get_all_posts_for_user( $user_id = 0 ) {
782
  */
783
  function bp_core_delete_account( $user_id = 0 ) {
784
 
 
785
  if ( empty( $user_id ) )
786
  $user_id = bp_loggedin_user_id();
787
 
788
- // Make sure account deletion is not disabled
789
- if ( !bp_current_user_can( 'delete_users' ) && bp_disable_account_deletion() )
790
  return false;
791
 
792
  // Site admins cannot be deleted
793
  if ( is_super_admin( $user_id ) )
794
  return false;
795
 
 
 
 
 
 
 
 
 
796
  do_action( 'bp_core_pre_delete_account', $user_id );
797
 
798
  // Specifically handle multi-site environment
782
  */
783
  function bp_core_delete_account( $user_id = 0 ) {
784
 
785
+ // Use logged in user ID if none is passed
786
  if ( empty( $user_id ) )
787
  $user_id = bp_loggedin_user_id();
788
 
789
+ // Bail if account deletion is disabled
790
+ if ( bp_disable_account_deletion() )
791
  return false;
792
 
793
  // Site admins cannot be deleted
794
  if ( is_super_admin( $user_id ) )
795
  return false;
796
 
797
+ // Bail if current user cannot delete any users
798
+ if ( ! bp_current_user_can( 'delete_users' ) )
799
+ return false;
800
+
801
+ // Bail if current user cannot delete this user
802
+ if ( ! current_user_can_for_blog( bp_get_root_blog_id(), 'delete_user', $user_id ) )
803
+ return false;
804
+
805
  do_action( 'bp_core_pre_delete_account', $user_id );
806
 
807
  // Specifically handle multi-site environment
bp-settings/bp-settings-loader.php CHANGED
@@ -129,7 +129,7 @@ class BP_Settings_Component extends BP_Component {
129
  }
130
 
131
  // Add Delete Account nav item
132
- if ( ! bp_disable_account_deletion() || bp_current_user_can( 'delete_users' ) ) {
133
  $sub_nav[] = array(
134
  'name' => __( 'Delete Account', 'buddypress' ),
135
  'slug' => 'delete-account',
@@ -137,7 +137,7 @@ class BP_Settings_Component extends BP_Component {
137
  'parent_slug' => $this->slug,
138
  'screen_function' => 'bp_settings_screen_delete_account',
139
  'position' => 90,
140
- 'user_has_access' => bp_is_my_profile() || !is_super_admin( bp_displayed_user_id() )
141
  );
142
  }
143
 
129
  }
130
 
131
  // Add Delete Account nav item
132
+ if ( ( ! bp_disable_account_deletion() && bp_is_my_profile() ) || bp_current_user_can( 'delete_users' ) ) {
133
  $sub_nav[] = array(
134
  'name' => __( 'Delete Account', 'buddypress' ),
135
  'slug' => 'delete-account',
137
  'parent_slug' => $this->slug,
138
  'screen_function' => 'bp_settings_screen_delete_account',
139
  'position' => 90,
140
+ 'user_has_access' => ! is_super_admin( bp_displayed_user_id() )
141
  );
142
  }
143
 
bp-themes/bp-default/rtl.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6.4
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.5
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-themes/bp-default/style.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6.4
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.5
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: johnjamesjacoby, DJPaul, boonebgorges
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.5
5
  Tested up to: 3.5
6
- Stable tag: 1.6.4
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.5
5
  Tested up to: 3.5
6
+ Stable tag: 1.6.5
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9