BuddyPress - Version 1.6-RC1

Version Description

= 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 DJPaul
Plugin Icon 128x128 BuddyPress
Version 1.6-RC1
Comparing to
See all releases

Code changes from version 1.6-beta2 to 1.6-RC1

Files changed (20) hide show
  1. bp-activity/bp-activity-admin.php +2 -2
  2. bp-activity/bp-activity-akismet.php +4 -1
  3. bp-activity/bp-activity-template.php +10 -8
  4. bp-core/bp-core-actions.php +0 -24
  5. bp-core/bp-core-cache.php +2 -0
  6. bp-core/bp-core-caps.php +35 -4
  7. bp-core/bp-core-functions.php +5 -0
  8. bp-core/bp-core-options.php +2 -2
  9. bp-languages/buddypress.pot +61 -61
  10. bp-loader.php +14 -14
  11. bp-members/bp-members-functions.php +1 -1
  12. bp-settings/bp-settings-actions.php +3 -3
  13. bp-settings/bp-settings-loader.php +1 -1
  14. bp-themes/bp-default/_inc/global.js +1 -1
  15. bp-themes/bp-default/footer.php +2 -2
  16. bp-themes/bp-default/header.php +2 -1
  17. bp-themes/bp-default/rtl.css +1 -1
  18. bp-themes/bp-default/style.css +1 -1
  19. bp-xprofile/bp-xprofile-classes.php +3 -5
  20. readme.txt +1 -1
bp-activity/bp-activity-admin.php CHANGED
@@ -864,8 +864,8 @@ function bp_activity_admin_index() {
864
  <?php wp_editor( '', 'bp-activities', array( 'dfw' => false, 'media_buttons' => false, 'quicktags' => array( 'buttons' => 'strong,em,link,block,del,ins,img,code,spell,close' ), 'tinymce' => false, ) ); ?>
865
 
866
  <p id="bp-replysubmit" class="submit">
867
- <a href="#" class="cancel button-secondary alignleft"><?php _e( 'Cancel', 'tmggc' ); ?></a>
868
- <a href="#" class="save button-primary alignright"><?php _e( 'Reply', 'tmggc' ); ?></a>
869
 
870
  <img class="waiting" style="display:none;" src="<?php echo esc_url( network_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
871
  <span class="error" style="display:none;"></span>
864
  <?php wp_editor( '', 'bp-activities', array( 'dfw' => false, 'media_buttons' => false, 'quicktags' => array( 'buttons' => 'strong,em,link,block,del,ins,img,code,spell,close' ), 'tinymce' => false, ) ); ?>
865
 
866
  <p id="bp-replysubmit" class="submit">
867
+ <a href="#" class="cancel button-secondary alignleft"><?php _e( 'Cancel', 'buddypress' ); ?></a>
868
+ <a href="#" class="save button-primary alignright"><?php _e( 'Reply', 'buddypress' ); ?></a>
869
 
870
  <img class="waiting" style="display:none;" src="<?php echo esc_url( network_admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
871
  <span class="error" style="display:none;"></span>
bp-activity/bp-activity-akismet.php CHANGED
@@ -464,7 +464,10 @@ class BP_Akismet {
464
  remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
465
 
466
  // Get the response
467
- $activity_data['bp_as_result'] = $response[1];
 
 
 
468
 
469
  // Perform a daily tidy up
470
  if ( ! wp_next_scheduled( 'bp_activity_akismet_delete_old_metadata' ) )
464
  remove_filter( 'akismet_ua', array( $this, 'buddypress_ua' ) );
465
 
466
  // Get the response
467
+ if ( ! empty( $response[1] ) && ! is_wp_error( $response[1] ) )
468
+ $activity_data['bp_as_result'] = $response[1];
469
+ else
470
+ $activity_data['bp_as_result'] = false;
471
 
472
  // Perform a daily tidy up
473
  if ( ! wp_next_scheduled( 'bp_activity_akismet_delete_old_metadata' ) )
bp-activity/bp-activity-template.php CHANGED
@@ -1062,11 +1062,12 @@ function bp_activity_secondary_avatar( $args = '' ) {
1062
  $item_id = $activities_template->activity->item_id;
1063
 
1064
  if ( empty( $alt ) ) {
1065
- $group = groups_get_group( $item_id );
1066
- if ( isset( $group->name ) ) {
1067
- $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name );
1068
- } else {
1069
- $alt = __( 'Group logo', 'buddypress' );
 
1070
  }
1071
  }
1072
 
@@ -2010,9 +2011,10 @@ function bp_activity_css_class() {
2010
  'new_member'
2011
  ) );
2012
 
2013
- $class = '';
 
2014
  if ( in_array( $activities_template->activity->type, (array) $mini_activity_actions ) || empty( $activities_template->activity->content ) )
2015
- $class = ' mini';
2016
 
2017
  if ( bp_activity_get_comment_count() && bp_activity_can_comment() )
2018
  $class .= ' has-comments';
@@ -2738,4 +2740,4 @@ function bp_activity_sitewide_feed() {
2738
  }
2739
  add_action( 'bp_head', 'bp_activity_sitewide_feed' );
2740
 
2741
- ?>
1062
  $item_id = $activities_template->activity->item_id;
1063
 
1064
  if ( empty( $alt ) ) {
1065
+ $alt = __( 'Group logo', 'buddypress' );
1066
+
1067
+ if ( bp_is_active( 'groups' ) ) {
1068
+ $group = groups_get_group( $item_id );
1069
+ if ( isset( $group->name ) )
1070
+ $alt = sprintf( __( 'Group logo of %s', 'buddypress' ), $group->name );
1071
  }
1072
  }
1073
 
2011
  'new_member'
2012
  ) );
2013
 
2014
+ $class = ' activity-item';
2015
+
2016
  if ( in_array( $activities_template->activity->type, (array) $mini_activity_actions ) || empty( $activities_template->activity->content ) )
2017
+ $class .= ' mini';
2018
 
2019
  if ( bp_activity_get_comment_count() && bp_activity_can_comment() )
2020
  $class .= ' has-comments';
2740
  }
2741
  add_action( 'bp_head', 'bp_activity_sitewide_feed' );
2742
 
2743
+ ?>
bp-core/bp-core-actions.php CHANGED
@@ -34,8 +34,6 @@ if ( !defined( 'ABSPATH' ) ) exit;
34
  add_action( 'plugins_loaded', 'bp_loaded', 10 );
35
  add_action( 'init', 'bp_init', 10 );
36
  add_action( 'wp', 'bp_ready', 10 );
37
- add_action( 'wp_head', 'bp_head', 10 );
38
- add_action( 'wp_footer', 'bp_footer', 10 );
39
  add_action( 'setup_theme', 'bp_setup_theme', 10 );
40
  add_action( 'after_theme_setup', 'bp_after_theme_setup', 10 );
41
  add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
@@ -200,28 +198,6 @@ function bp_widgets_init() {
200
 
201
  /** Theme *********************************************************************/
202
 
203
- /**
204
- * Piggy-back action for BuddyPress specific <head> actions in a theme
205
- *
206
- * @since BuddyPress (1.6)
207
- *
208
- * @uses do_action() Calls 'bp_head' hook
209
- */
210
- function bp_head() {
211
- do_action( 'bp_head' );
212
- }
213
-
214
- /**
215
- * Piggy-back action for BuddyPress specific footer actions in a theme
216
- *
217
- * @since BuddyPress (1.6)
218
- *
219
- * @uses do_action() Calls 'bp_footer' hook
220
- */
221
- function bp_footer() {
222
- do_action( 'bp_footer' );
223
- }
224
-
225
  /**
226
  * Enqueue BuddyPress specific CSS and JS
227
  *
34
  add_action( 'plugins_loaded', 'bp_loaded', 10 );
35
  add_action( 'init', 'bp_init', 10 );
36
  add_action( 'wp', 'bp_ready', 10 );
 
 
37
  add_action( 'setup_theme', 'bp_setup_theme', 10 );
38
  add_action( 'after_theme_setup', 'bp_after_theme_setup', 10 );
39
  add_action( 'wp_enqueue_scripts', 'bp_enqueue_scripts', 10 );
198
 
199
  /** Theme *********************************************************************/
200
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
201
  /**
202
  * Enqueue BuddyPress specific CSS and JS
203
  *
bp-core/bp-core-cache.php CHANGED
@@ -54,6 +54,8 @@ function bp_core_clear_member_count_caches() {
54
  add_action( 'bp_core_activated_user', 'bp_core_clear_member_count_caches' );
55
  add_action( 'bp_core_process_spammer_status', 'bp_core_clear_member_count_caches' );
56
  add_action( 'bp_core_deleted_account', 'bp_core_clear_member_count_caches' );
 
 
57
 
58
  /**
59
  * Update the metadata cache for the specified objects.
54
  add_action( 'bp_core_activated_user', 'bp_core_clear_member_count_caches' );
55
  add_action( 'bp_core_process_spammer_status', 'bp_core_clear_member_count_caches' );
56
  add_action( 'bp_core_deleted_account', 'bp_core_clear_member_count_caches' );
57
+ add_action( 'bp_first_activity_for_member', 'bp_core_clear_member_count_caches' );
58
+ add_action( 'deleted_user', 'bp_core_clear_member_count_caches' );
59
 
60
  /**
61
  * Update the metadata cache for the specified objects.
bp-core/bp-core-caps.php CHANGED
@@ -379,10 +379,6 @@ function bp_global_access_role_mask() {
379
  */
380
  function bp_current_user_can( $capability, $blog_id = 0 ) {
381
 
382
- // @todo: remove this when implemented
383
- if ( is_super_admin() )
384
- return true;
385
-
386
  // Use root blog if no ID passed
387
  if ( empty( $blog_id ) )
388
  $blog_id = bp_get_root_blog_id();
@@ -392,4 +388,39 @@ function bp_current_user_can( $capability, $blog_id = 0 ) {
392
  return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
393
  }
394
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
395
  ?>
379
  */
380
  function bp_current_user_can( $capability, $blog_id = 0 ) {
381
 
 
 
 
 
382
  // Use root blog if no ID passed
383
  if ( empty( $blog_id ) )
384
  $blog_id = bp_get_root_blog_id();
388
  return (bool) apply_filters( 'bp_current_user_can', $retval, $capability, $blog_id );
389
  }
390
 
391
+ /**
392
+ * Temporary implementation of 'bp_moderate' cap
393
+ *
394
+ * In BuddyPress 1.6, the 'bp_moderate' cap was introduced. In order to enforce that
395
+ * bp_current_user_can( 'bp_moderate' ) always returns true for Administrators, we must manually
396
+ * add the 'bp_moderate' cap to the list of user caps for Admins.
397
+ *
398
+ * Note that this level of enforcement is only necessary in the case of non-Multisite. This is
399
+ * because WordPress automatically assigns every capability - and thus 'bp_moderate' - to Super
400
+ * Admins on a Multisite installation. See WP_User::has_cap().
401
+ *
402
+ * This implementation of 'bp_moderate' is temporary, until BuddyPress properly matches caps to
403
+ * roles and stores them in the database. Plugin authors: Do not use this function.
404
+ *
405
+ * @since BuddyPress (1.6)
406
+ * @see WP_User::has_cap()
407
+ *
408
+ * @param array $allcaps The caps that WP associates with the given role
409
+ * @param array $caps The caps being tested for in WP_User::has_cap()
410
+ * @param array $args Miscellaneous arguments passed to the user_has_cap filter
411
+ * @return array $allcaps The user's cap list, with 'bp_moderate' appended, if relevant
412
+ */
413
+ function _bp_enforce_bp_moderate_cap_for_admins( $allcaps, $caps, $args ) {
414
+ if ( in_array( 'bp_moderate', $caps ) && // We only care if checking for bp_moderate
415
+ !in_array( 'do_not_allow', $caps ) && // 'do_not_allow' overrides everything else
416
+ !is_multisite() && // Check not necessary on Multisite
417
+ isset( $allcaps['delete_users'] ) ) // Mimicking WP's check for Administrator status
418
+ {
419
+ $allcaps['bp_moderate'] = true;
420
+ }
421
+
422
+ return $allcaps;
423
+ }
424
+ add_filter( 'user_has_cap', '_bp_enforce_bp_moderate_cap_for_admins', 10, 3 );
425
+
426
  ?>
bp-core/bp-core-functions.php CHANGED
@@ -498,6 +498,11 @@ function bp_core_record_activity() {
498
  // Get current time
499
  $current_time = bp_core_current_time();
500
 
 
 
 
 
 
501
  if ( empty( $activity ) || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) )
502
  bp_update_user_meta( $user_id, 'last_activity', $current_time );
503
  }
498
  // Get current time
499
  $current_time = bp_core_current_time();
500
 
501
+ // Use this action to detect the very first activity for a given member
502
+ if ( empty( $activity ) ) {
503
+ do_action( 'bp_first_activity_for_member', $user_id );
504
+ }
505
+
506
  if ( empty( $activity ) || strtotime( $current_time ) >= strtotime( '+5 minutes', $activity ) )
507
  bp_update_user_meta( $user_id, 'last_activity', $current_time );
508
  }
bp-core/bp-core-options.php CHANGED
@@ -412,7 +412,7 @@ function bp_disable_avatar_uploads( $default = true ) {
412
  }
413
 
414
  /**
415
- * Are members able to delete their own accounts
416
  *
417
  * @since BuddyPress (1.6)
418
  *
@@ -426,7 +426,7 @@ function bp_disable_account_deletion( $default = false ) {
426
  }
427
 
428
  /**
429
- * Are blog and forum activity stream comments disabled
430
  *
431
  * @since BuddyPress (1.6)
432
  *
412
  }
413
 
414
  /**
415
+ * Are members able to delete their own accounts?
416
  *
417
  * @since BuddyPress (1.6)
418
  *
426
  }
427
 
428
  /**
429
+ * Are blog and forum activity stream comments disabled?
430
  *
431
  * @since BuddyPress (1.6)
432
  *
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: 2012-07-04 18:36:27+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -315,7 +315,7 @@ msgstr ""
315
  #: bp-activity/bp-activity-admin.php:867
316
  #: bp-themes/bp-default/forums/index.php:134
317
  #: bp-xprofile/bp-xprofile-classes.php:404
318
- #: bp-xprofile/bp-xprofile-classes.php:914
319
  msgid "Cancel"
320
  msgstr ""
321
 
@@ -428,11 +428,11 @@ msgstr ""
428
  msgid "Akismet was unable to check this item (response: %s), will automatically retry again later."
429
  msgstr ""
430
 
431
- #: bp-activity/bp-activity-akismet.php:499
432
  msgid "Activity History"
433
  msgstr ""
434
 
435
- #: bp-activity/bp-activity-akismet.php:517
436
  msgctxt "x hours ago - akismet cleared this item"
437
  msgid "<span>%1$s</span> &mdash; %2$s"
438
  msgstr ""
@@ -537,8 +537,8 @@ msgstr ""
537
 
538
  #: bp-activity/bp-activity-loader.php:314
539
  #: bp-activity/bp-activity-template.php:968
540
- #: bp-activity/bp-activity-template.php:1088
541
- #: bp-activity/bp-activity-template.php:1098 bp-blogs/bp-blogs-loader.php:200
542
  #: bp-forums/bp-forums-loader.php:238 bp-forums/bp-forums-template.php:487
543
  #: bp-forums/bp-forums-template.php:604 bp-forums/bp-forums-template.php:1196
544
  #: bp-friends/bp-friends-loader.php:203 bp-groups/bp-groups-loader.php:557
@@ -675,24 +675,24 @@ msgstr ""
675
  msgid "Profile picture"
676
  msgstr ""
677
 
678
- #: bp-activity/bp-activity-template.php:1067
679
- #: bp-groups/bp-groups-template.php:391
680
- msgid "Group logo of %s"
681
  msgstr ""
682
 
683
- #: bp-activity/bp-activity-template.php:1069
684
- msgid "Group logo"
 
685
  msgstr ""
686
 
687
- #: bp-activity/bp-activity-template.php:1079
688
  msgid "Profile picture of the author of the site %s"
689
  msgstr ""
690
 
691
- #: bp-activity/bp-activity-template.php:1269
692
  msgid "View Discussion"
693
  msgstr ""
694
 
695
- #: bp-activity/bp-activity-template.php:2063
696
  #: bp-forums/bp-forums-template.php:1267 bp-groups/bp-groups-template.php:1294
697
  #: bp-themes/bp-default/activity/comment.php:43
698
  #: bp-themes/bp-default/members/single/messages/messages-loop.php:51
@@ -701,7 +701,7 @@ msgstr ""
701
  msgid "Delete"
702
  msgstr ""
703
 
704
- #: bp-activity/bp-activity-template.php:2110
705
  #: bp-core/admin/bp-core-slugs.php:112 bp-core/admin/bp-core-slugs.php:173
706
  #: bp-members/bp-members-template.php:582
707
  #: bp-themes/bp-default/activity/entry.php:37
@@ -710,23 +710,23 @@ msgstr ""
710
  msgid "View"
711
  msgstr ""
712
 
713
- #: bp-activity/bp-activity-template.php:2204
714
  msgid "Clear Filter"
715
  msgstr ""
716
 
717
- #: bp-activity/bp-activity-template.php:2387
718
  msgid "a user"
719
  msgstr ""
720
 
721
- #: bp-activity/bp-activity-template.php:2427
722
  msgid "Send a public message on your activity stream."
723
  msgstr ""
724
 
725
- #: bp-activity/bp-activity-template.php:2428
726
  msgid "Public Message"
727
  msgstr ""
728
 
729
- #: bp-activity/bp-activity-template.php:2735
730
  msgid "Site Wide Activity RSS Feed"
731
  msgstr ""
732
 
@@ -1002,7 +1002,7 @@ msgstr ""
1002
  #: bp-blogs/bp-blogs-template.php:617 bp-core/deprecated/1.5.php:397
1003
  #: bp-forums/bp-forums-template.php:1317 bp-groups/bp-groups-template.php:2292
1004
  #: bp-members/bp-members-template.php:667
1005
- #: bp-messages/bp-messages-template.php:373 bp-themes/bp-default/header.php:29
1006
  #: bp-themes/bp-default/searchform.php:5
1007
  msgid "Search"
1008
  msgstr ""
@@ -1323,7 +1323,7 @@ msgstr ""
1323
 
1324
  #: bp-core/admin/bp-core-slugs.php:108 bp-core/admin/bp-core-slugs.php:169
1325
  #: bp-themes/bp-default/members/single/settings/capabilities.php:61
1326
- #: bp-xprofile/bp-xprofile-classes.php:913
1327
  msgid "Save"
1328
  msgstr ""
1329
 
@@ -1951,7 +1951,7 @@ msgctxt "Separator in time since"
1951
  msgid ","
1952
  msgstr ""
1953
 
1954
- #: bp-core/bp-core-functions.php:518
1955
  msgid "Not recently active"
1956
  msgstr ""
1957
 
@@ -4261,7 +4261,7 @@ msgstr ""
4261
  #: bp-themes/bp-default/members/single/forums.php:18
4262
  #: bp-themes/bp-default/members/single/friends.php:20
4263
  #: bp-themes/bp-default/members/single/groups.php:20
4264
- #: bp-xprofile/bp-xprofile-classes.php:742
4265
  msgid "Order By:"
4266
  msgstr ""
4267
 
@@ -4866,12 +4866,12 @@ msgstr ""
4866
  msgid "Send Request"
4867
  msgstr ""
4868
 
4869
- #: bp-themes/bp-default/header.php:21
4870
  msgctxt "Home page banner link title"
4871
  msgid "Home"
4872
  msgstr ""
4873
 
4874
- #: bp-themes/bp-default/header.php:24
4875
  msgid "Search for:"
4876
  msgstr ""
4877
 
@@ -5355,7 +5355,7 @@ msgid "Edit Field Group"
5355
  msgstr ""
5356
 
5357
  #: bp-xprofile/bp-xprofile-classes.php:370
5358
- #: bp-xprofile/bp-xprofile-classes.php:825
5359
  msgid "Fields marked * are required"
5360
  msgstr ""
5361
 
@@ -5368,130 +5368,130 @@ msgid "Group Description"
5368
  msgstr ""
5369
 
5370
  #: bp-xprofile/bp-xprofile-classes.php:404
5371
- #: bp-xprofile/bp-xprofile-classes.php:914
5372
  msgid "or"
5373
  msgstr ""
5374
 
5375
- #: bp-xprofile/bp-xprofile-classes.php:741
5376
  msgid "Please enter options for this Field:"
5377
  msgstr ""
5378
 
5379
- #: bp-xprofile/bp-xprofile-classes.php:744
5380
  msgid "Order Entered"
5381
  msgstr ""
5382
 
5383
- #: bp-xprofile/bp-xprofile-classes.php:745
5384
  msgid "Name - Ascending"
5385
  msgstr ""
5386
 
5387
- #: bp-xprofile/bp-xprofile-classes.php:746
5388
  msgid "Name - Descending"
5389
  msgstr ""
5390
 
5391
- #: bp-xprofile/bp-xprofile-classes.php:770
5392
- #: bp-xprofile/bp-xprofile-classes.php:791
5393
  msgid "Option"
5394
  msgstr ""
5395
 
5396
- #: bp-xprofile/bp-xprofile-classes.php:772
5397
- #: bp-xprofile/bp-xprofile-classes.php:792
5398
  msgid "Default Value"
5399
  msgstr ""
5400
 
5401
- #: bp-xprofile/bp-xprofile-classes.php:798
5402
  msgid "Add Another Option"
5403
  msgstr ""
5404
 
5405
- #: bp-xprofile/bp-xprofile-classes.php:806
5406
  msgid "Add Field"
5407
  msgstr ""
5408
 
5409
- #: bp-xprofile/bp-xprofile-classes.php:818
5410
  msgid "Edit Field"
5411
  msgstr ""
5412
 
5413
- #: bp-xprofile/bp-xprofile-classes.php:838
5414
  msgid "Field Title"
5415
  msgstr ""
5416
 
5417
- #: bp-xprofile/bp-xprofile-classes.php:845
5418
  msgid "Field Description"
5419
  msgstr ""
5420
 
5421
- #: bp-xprofile/bp-xprofile-classes.php:854
5422
  msgid "Is This Field Required?"
5423
  msgstr ""
5424
 
5425
- #: bp-xprofile/bp-xprofile-classes.php:856
5426
  msgid "Not Required"
5427
  msgstr ""
5428
 
5429
- #: bp-xprofile/bp-xprofile-classes.php:857
5430
  msgid "Required"
5431
  msgstr ""
5432
 
5433
- #: bp-xprofile/bp-xprofile-classes.php:862
5434
  msgid "Field Type"
5435
  msgstr ""
5436
 
5437
- #: bp-xprofile/bp-xprofile-classes.php:864
5438
  msgid "Text Box"
5439
  msgstr ""
5440
 
5441
- #: bp-xprofile/bp-xprofile-classes.php:865
5442
  msgid "Multi-line Text Box"
5443
  msgstr ""
5444
 
5445
- #: bp-xprofile/bp-xprofile-classes.php:866
5446
  msgid "Date Selector"
5447
  msgstr ""
5448
 
5449
- #: bp-xprofile/bp-xprofile-classes.php:867
5450
  msgid "Radio Buttons"
5451
  msgstr ""
5452
 
5453
- #: bp-xprofile/bp-xprofile-classes.php:868
5454
  msgid "Drop Down Select Box"
5455
  msgstr ""
5456
 
5457
- #: bp-xprofile/bp-xprofile-classes.php:869
5458
  msgid "Multi Select Box"
5459
  msgstr ""
5460
 
5461
- #: bp-xprofile/bp-xprofile-classes.php:870
5462
  msgid "Checkboxes"
5463
  msgstr ""
5464
 
5465
- #: bp-xprofile/bp-xprofile-classes.php:891
5466
  msgid "Default Visibility"
5467
  msgstr ""
5468
 
5469
- #: bp-xprofile/bp-xprofile-classes.php:900
5470
  msgid "Per-Member Visibility"
5471
  msgstr ""
5472
 
5473
- #: bp-xprofile/bp-xprofile-classes.php:902
5474
  msgid "Let members change the this field's visibility"
5475
  msgstr ""
5476
 
5477
- #: bp-xprofile/bp-xprofile-classes.php:904
5478
  msgid "Enforce the default visibility for all members"
5479
  msgstr ""
5480
 
5481
- #: bp-xprofile/bp-xprofile-classes.php:932
5482
  msgid "Please make sure you fill out all required fields."
5483
  msgstr ""
5484
 
5485
- #: bp-xprofile/bp-xprofile-classes.php:935
5486
  msgid "Radio button field types require at least one option. Please add options below."
5487
  msgstr ""
5488
 
5489
- #: bp-xprofile/bp-xprofile-classes.php:938
5490
- #: bp-xprofile/bp-xprofile-classes.php:941
5491
  msgid "Select box field types require at least one option. Please add options below."
5492
  msgstr ""
5493
 
5494
- #: bp-xprofile/bp-xprofile-classes.php:944
5495
  msgid "Checkbox field types require at least one option. Please add options below."
5496
  msgstr ""
5497
 
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2012-07-19 19:36:51+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
315
  #: bp-activity/bp-activity-admin.php:867
316
  #: bp-themes/bp-default/forums/index.php:134
317
  #: bp-xprofile/bp-xprofile-classes.php:404
318
+ #: bp-xprofile/bp-xprofile-classes.php:912
319
  msgid "Cancel"
320
  msgstr ""
321
 
428
  msgid "Akismet was unable to check this item (response: %s), will automatically retry again later."
429
  msgstr ""
430
 
431
+ #: bp-activity/bp-activity-akismet.php:502
432
  msgid "Activity History"
433
  msgstr ""
434
 
435
+ #: bp-activity/bp-activity-akismet.php:520
436
  msgctxt "x hours ago - akismet cleared this item"
437
  msgid "<span>%1$s</span> &mdash; %2$s"
438
  msgstr ""
537
 
538
  #: bp-activity/bp-activity-loader.php:314
539
  #: bp-activity/bp-activity-template.php:968
540
+ #: bp-activity/bp-activity-template.php:1089
541
+ #: bp-activity/bp-activity-template.php:1099 bp-blogs/bp-blogs-loader.php:200
542
  #: bp-forums/bp-forums-loader.php:238 bp-forums/bp-forums-template.php:487
543
  #: bp-forums/bp-forums-template.php:604 bp-forums/bp-forums-template.php:1196
544
  #: bp-friends/bp-friends-loader.php:203 bp-groups/bp-groups-loader.php:557
675
  msgid "Profile picture"
676
  msgstr ""
677
 
678
+ #: bp-activity/bp-activity-template.php:1065
679
+ msgid "Group logo"
 
680
  msgstr ""
681
 
682
+ #: bp-activity/bp-activity-template.php:1070
683
+ #: bp-groups/bp-groups-template.php:391
684
+ msgid "Group logo of %s"
685
  msgstr ""
686
 
687
+ #: bp-activity/bp-activity-template.php:1080
688
  msgid "Profile picture of the author of the site %s"
689
  msgstr ""
690
 
691
+ #: bp-activity/bp-activity-template.php:1270
692
  msgid "View Discussion"
693
  msgstr ""
694
 
695
+ #: bp-activity/bp-activity-template.php:2065
696
  #: bp-forums/bp-forums-template.php:1267 bp-groups/bp-groups-template.php:1294
697
  #: bp-themes/bp-default/activity/comment.php:43
698
  #: bp-themes/bp-default/members/single/messages/messages-loop.php:51
701
  msgid "Delete"
702
  msgstr ""
703
 
704
+ #: bp-activity/bp-activity-template.php:2112
705
  #: bp-core/admin/bp-core-slugs.php:112 bp-core/admin/bp-core-slugs.php:173
706
  #: bp-members/bp-members-template.php:582
707
  #: bp-themes/bp-default/activity/entry.php:37
710
  msgid "View"
711
  msgstr ""
712
 
713
+ #: bp-activity/bp-activity-template.php:2206
714
  msgid "Clear Filter"
715
  msgstr ""
716
 
717
+ #: bp-activity/bp-activity-template.php:2389
718
  msgid "a user"
719
  msgstr ""
720
 
721
+ #: bp-activity/bp-activity-template.php:2429
722
  msgid "Send a public message on your activity stream."
723
  msgstr ""
724
 
725
+ #: bp-activity/bp-activity-template.php:2430
726
  msgid "Public Message"
727
  msgstr ""
728
 
729
+ #: bp-activity/bp-activity-template.php:2737
730
  msgid "Site Wide Activity RSS Feed"
731
  msgstr ""
732
 
1002
  #: bp-blogs/bp-blogs-template.php:617 bp-core/deprecated/1.5.php:397
1003
  #: bp-forums/bp-forums-template.php:1317 bp-groups/bp-groups-template.php:2292
1004
  #: bp-members/bp-members-template.php:667
1005
+ #: bp-messages/bp-messages-template.php:373 bp-themes/bp-default/header.php:30
1006
  #: bp-themes/bp-default/searchform.php:5
1007
  msgid "Search"
1008
  msgstr ""
1323
 
1324
  #: bp-core/admin/bp-core-slugs.php:108 bp-core/admin/bp-core-slugs.php:169
1325
  #: bp-themes/bp-default/members/single/settings/capabilities.php:61
1326
+ #: bp-xprofile/bp-xprofile-classes.php:911
1327
  msgid "Save"
1328
  msgstr ""
1329
 
1951
  msgid ","
1952
  msgstr ""
1953
 
1954
+ #: bp-core/bp-core-functions.php:523
1955
  msgid "Not recently active"
1956
  msgstr ""
1957
 
4261
  #: bp-themes/bp-default/members/single/forums.php:18
4262
  #: bp-themes/bp-default/members/single/friends.php:20
4263
  #: bp-themes/bp-default/members/single/groups.php:20
4264
+ #: bp-xprofile/bp-xprofile-classes.php:740
4265
  msgid "Order By:"
4266
  msgstr ""
4267
 
4866
  msgid "Send Request"
4867
  msgstr ""
4868
 
4869
+ #: bp-themes/bp-default/header.php:22
4870
  msgctxt "Home page banner link title"
4871
  msgid "Home"
4872
  msgstr ""
4873
 
4874
+ #: bp-themes/bp-default/header.php:25
4875
  msgid "Search for:"
4876
  msgstr ""
4877
 
5355
  msgstr ""
5356
 
5357
  #: bp-xprofile/bp-xprofile-classes.php:370
5358
+ #: bp-xprofile/bp-xprofile-classes.php:823
5359
  msgid "Fields marked * are required"
5360
  msgstr ""
5361
 
5368
  msgstr ""
5369
 
5370
  #: bp-xprofile/bp-xprofile-classes.php:404
5371
+ #: bp-xprofile/bp-xprofile-classes.php:912
5372
  msgid "or"
5373
  msgstr ""
5374
 
5375
+ #: bp-xprofile/bp-xprofile-classes.php:739
5376
  msgid "Please enter options for this Field:"
5377
  msgstr ""
5378
 
5379
+ #: bp-xprofile/bp-xprofile-classes.php:742
5380
  msgid "Order Entered"
5381
  msgstr ""
5382
 
5383
+ #: bp-xprofile/bp-xprofile-classes.php:743
5384
  msgid "Name - Ascending"
5385
  msgstr ""
5386
 
5387
+ #: bp-xprofile/bp-xprofile-classes.php:744
5388
  msgid "Name - Descending"
5389
  msgstr ""
5390
 
5391
+ #: bp-xprofile/bp-xprofile-classes.php:768
5392
+ #: bp-xprofile/bp-xprofile-classes.php:789
5393
  msgid "Option"
5394
  msgstr ""
5395
 
5396
+ #: bp-xprofile/bp-xprofile-classes.php:770
5397
+ #: bp-xprofile/bp-xprofile-classes.php:790
5398
  msgid "Default Value"
5399
  msgstr ""
5400
 
5401
+ #: bp-xprofile/bp-xprofile-classes.php:796
5402
  msgid "Add Another Option"
5403
  msgstr ""
5404
 
5405
+ #: bp-xprofile/bp-xprofile-classes.php:804
5406
  msgid "Add Field"
5407
  msgstr ""
5408
 
5409
+ #: bp-xprofile/bp-xprofile-classes.php:816
5410
  msgid "Edit Field"
5411
  msgstr ""
5412
 
5413
+ #: bp-xprofile/bp-xprofile-classes.php:836
5414
  msgid "Field Title"
5415
  msgstr ""
5416
 
5417
+ #: bp-xprofile/bp-xprofile-classes.php:843
5418
  msgid "Field Description"
5419
  msgstr ""
5420
 
5421
+ #: bp-xprofile/bp-xprofile-classes.php:852
5422
  msgid "Is This Field Required?"
5423
  msgstr ""
5424
 
5425
+ #: bp-xprofile/bp-xprofile-classes.php:854
5426
  msgid "Not Required"
5427
  msgstr ""
5428
 
5429
+ #: bp-xprofile/bp-xprofile-classes.php:855
5430
  msgid "Required"
5431
  msgstr ""
5432
 
5433
+ #: bp-xprofile/bp-xprofile-classes.php:860
5434
  msgid "Field Type"
5435
  msgstr ""
5436
 
5437
+ #: bp-xprofile/bp-xprofile-classes.php:862
5438
  msgid "Text Box"
5439
  msgstr ""
5440
 
5441
+ #: bp-xprofile/bp-xprofile-classes.php:863
5442
  msgid "Multi-line Text Box"
5443
  msgstr ""
5444
 
5445
+ #: bp-xprofile/bp-xprofile-classes.php:864
5446
  msgid "Date Selector"
5447
  msgstr ""
5448
 
5449
+ #: bp-xprofile/bp-xprofile-classes.php:865
5450
  msgid "Radio Buttons"
5451
  msgstr ""
5452
 
5453
+ #: bp-xprofile/bp-xprofile-classes.php:866
5454
  msgid "Drop Down Select Box"
5455
  msgstr ""
5456
 
5457
+ #: bp-xprofile/bp-xprofile-classes.php:867
5458
  msgid "Multi Select Box"
5459
  msgstr ""
5460
 
5461
+ #: bp-xprofile/bp-xprofile-classes.php:868
5462
  msgid "Checkboxes"
5463
  msgstr ""
5464
 
5465
+ #: bp-xprofile/bp-xprofile-classes.php:889
5466
  msgid "Default Visibility"
5467
  msgstr ""
5468
 
5469
+ #: bp-xprofile/bp-xprofile-classes.php:898
5470
  msgid "Per-Member Visibility"
5471
  msgstr ""
5472
 
5473
+ #: bp-xprofile/bp-xprofile-classes.php:900
5474
  msgid "Let members change the this field's visibility"
5475
  msgstr ""
5476
 
5477
+ #: bp-xprofile/bp-xprofile-classes.php:902
5478
  msgid "Enforce the default visibility for all members"
5479
  msgstr ""
5480
 
5481
+ #: bp-xprofile/bp-xprofile-classes.php:930
5482
  msgid "Please make sure you fill out all required fields."
5483
  msgstr ""
5484
 
5485
+ #: bp-xprofile/bp-xprofile-classes.php:933
5486
  msgid "Radio button field types require at least one option. Please add options below."
5487
  msgstr ""
5488
 
5489
+ #: bp-xprofile/bp-xprofile-classes.php:936
5490
+ #: bp-xprofile/bp-xprofile-classes.php:939
5491
  msgid "Select box field types require at least one option. Please add options below."
5492
  msgstr ""
5493
 
5494
+ #: bp-xprofile/bp-xprofile-classes.php:942
5495
  msgid "Checkbox field types require at least one option. Please add options below."
5496
  msgstr ""
5497
 
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-beta2
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
@@ -42,7 +42,7 @@ class BuddyPress {
42
  *
43
  * Most of them have reference functions located in bp-core-functions.php.
44
  * The ones that don't can be accessed via their respective WordPress API's.
45
- *
46
  * Components are encouraged to store their data in the $bp global rather
47
  * than new globals to keep all BuddyPress data in one place.
48
  */
@@ -52,18 +52,18 @@ class BuddyPress {
52
  /**
53
  * @var string BuddyPress version
54
  */
55
- public $version = '1.6-beta2-6162';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
59
  */
60
  public $db_version = 6066;
61
-
62
  /**
63
  * @var int Database version raw from database connection
64
  */
65
  public $db_version_raw = 0;
66
-
67
  /**
68
  * @var string State of BuddyPress installation
69
  */
@@ -136,7 +136,7 @@ class BuddyPress {
136
  public $displayed_user = null;
137
 
138
  /** Navigation ************************************************************/
139
-
140
  /**
141
  * @var array Primary BuddyPress navigation
142
  */
@@ -172,7 +172,7 @@ class BuddyPress {
172
  * @var bool Are status headers already sent?
173
  */
174
  public $no_status_set = false;
175
-
176
  /**
177
  * @var array The canonical URI stack
178
  * @see bp_redirect_canonical()
@@ -235,7 +235,7 @@ class BuddyPress {
235
 
236
  /**
237
  * Legacy BuddyPress constants
238
- *
239
  * Try to avoid using these. Their values have been moved into variables
240
  * in the $bp global, and have matching functions to get/set their value.
241
  *
@@ -267,7 +267,7 @@ class BuddyPress {
267
 
268
  // Default to 1
269
  $root_blog_id = 1;
270
-
271
  // Root blog is the main site on this network
272
  if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
273
  $current_site = get_current_site();
@@ -300,7 +300,7 @@ class BuddyPress {
300
  //
301
  // @todo Make this better
302
  if ( !defined( 'BP_SEARCH_SLUG' ) )
303
- define( 'BP_SEARCH_SLUG', 'search' );
304
  }
305
 
306
  /**
@@ -336,7 +336,7 @@ class BuddyPress {
336
  $this->lang_dir = $this->plugin_dir . 'bp-languages';
337
 
338
  /** Users *************************************************************/
339
-
340
  $this->current_user = new stdClass();
341
  $this->displayed_user = new stdClass();
342
  }
@@ -424,13 +424,13 @@ class BuddyPress {
424
  require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
425
  require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
426
  require( $this->plugin_dir . 'bp-core/bp-core-loader.php' );
427
-
428
  // Skip or load deprecated content
429
  if ( false !== $this->load_deprecated ) {
430
  require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
431
  require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
432
  }
433
- }
434
  }
435
 
436
  /**
@@ -469,7 +469,7 @@ class BuddyPress {
469
  // Add the actions
470
  foreach( $actions as $class_action )
471
  add_action( 'bp_' . $class_action, array( $this, $class_action ), 5 );
472
-
473
  // Setup the BuddyPress theme directory
474
  register_theme_directory( $this->themes_dir );
475
  }
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-RC1
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
42
  *
43
  * Most of them have reference functions located in bp-core-functions.php.
44
  * The ones that don't can be accessed via their respective WordPress API's.
45
+ *
46
  * Components are encouraged to store their data in the $bp global rather
47
  * than new globals to keep all BuddyPress data in one place.
48
  */
52
  /**
53
  * @var string BuddyPress version
54
  */
55
+ public $version = '1.6-RC1';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
59
  */
60
  public $db_version = 6066;
61
+
62
  /**
63
  * @var int Database version raw from database connection
64
  */
65
  public $db_version_raw = 0;
66
+
67
  /**
68
  * @var string State of BuddyPress installation
69
  */
136
  public $displayed_user = null;
137
 
138
  /** Navigation ************************************************************/
139
+
140
  /**
141
  * @var array Primary BuddyPress navigation
142
  */
172
  * @var bool Are status headers already sent?
173
  */
174
  public $no_status_set = false;
175
+
176
  /**
177
  * @var array The canonical URI stack
178
  * @see bp_redirect_canonical()
235
 
236
  /**
237
  * Legacy BuddyPress constants
238
+ *
239
  * Try to avoid using these. Their values have been moved into variables
240
  * in the $bp global, and have matching functions to get/set their value.
241
  *
267
 
268
  // Default to 1
269
  $root_blog_id = 1;
270
+
271
  // Root blog is the main site on this network
272
  if ( is_multisite() && !defined( 'BP_ENABLE_MULTIBLOG' ) ) {
273
  $current_site = get_current_site();
300
  //
301
  // @todo Make this better
302
  if ( !defined( 'BP_SEARCH_SLUG' ) )
303
+ define( 'BP_SEARCH_SLUG', 'search' );
304
  }
305
 
306
  /**
336
  $this->lang_dir = $this->plugin_dir . 'bp-languages';
337
 
338
  /** Users *************************************************************/
339
+
340
  $this->current_user = new stdClass();
341
  $this->displayed_user = new stdClass();
342
  }
424
  require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
425
  require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
426
  require( $this->plugin_dir . 'bp-core/bp-core-loader.php' );
427
+
428
  // Skip or load deprecated content
429
  if ( false !== $this->load_deprecated ) {
430
  require( $this->plugin_dir . 'bp-core/deprecated/1.5.php' );
431
  require( $this->plugin_dir . 'bp-core/deprecated/1.6.php' );
432
  }
433
+ }
434
  }
435
 
436
  /**
469
  // Add the actions
470
  foreach( $actions as $class_action )
471
  add_action( 'bp_' . $class_action, array( $this, $class_action ), 5 );
472
+
473
  // Setup the BuddyPress theme directory
474
  register_theme_directory( $this->themes_dir );
475
  }
bp-members/bp-members-functions.php CHANGED
@@ -786,7 +786,7 @@ function bp_core_delete_account( $user_id = 0 ) {
786
  $user_id = bp_loggedin_user_id();
787
 
788
  // Make sure account deletion is not disabled
789
- if ( bp_disable_account_deletion() )
790
  return false;
791
 
792
  // Site admins cannot be deleted
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
bp-settings/bp-settings-actions.php CHANGED
@@ -13,12 +13,12 @@ if ( !defined( 'ABSPATH' ) ) exit;
13
 
14
  /**
15
  * Handles the changing and saving of user email addressos and passwords
16
- *
17
  * We do quite a bit of logic and error handling here to make sure that users
18
  * do not accidentally lock themselves out of their accounts. We also try to
19
  * provide as accurate of feedback as possible without exposing anyone else's
20
  * inforation to them.
21
- *
22
  * Special considerations are made for super admins that are able to edit any
23
  * users accounts already, without knowing their existing password.
24
  *
@@ -256,7 +256,7 @@ function bp_settings_action_notifications() {
256
  }
257
 
258
  do_action( 'bp_core_notification_settings_after_save' );
259
-
260
  bp_core_redirect( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications/' );
261
  }
262
  }
13
 
14
  /**
15
  * Handles the changing and saving of user email addressos and passwords
16
+ *
17
  * We do quite a bit of logic and error handling here to make sure that users
18
  * do not accidentally lock themselves out of their accounts. We also try to
19
  * provide as accurate of feedback as possible without exposing anyone else's
20
  * inforation to them.
21
+ *
22
  * Special considerations are made for super admins that are able to edit any
23
  * users accounts already, without knowing their existing password.
24
  *
256
  }
257
 
258
  do_action( 'bp_core_notification_settings_after_save' );
259
+
260
  bp_core_redirect( bp_displayed_user_domain() . bp_get_settings_slug() . '/notifications/' );
261
  }
262
  }
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() ) {
133
  $sub_nav[] = array(
134
  'name' => __( 'Delete Account', 'buddypress' ),
135
  'slug' => 'delete-account',
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',
bp-themes/bp-default/_inc/global.js CHANGED
@@ -188,7 +188,7 @@ jq(document).ready( function() {
188
  /* Favoriting activity stream items */
189
  if ( target.hasClass('fav') || target.hasClass('unfav') ) {
190
  var type = target.hasClass('fav') ? 'fav' : 'unfav';
191
- var parent = target.closest('.activity_update');
192
  var parent_id = parent.attr('id').substr( 9, parent.attr('id').length );
193
 
194
  target.addClass('loading');
188
  /* Favoriting activity stream items */
189
  if ( target.hasClass('fav') || target.hasClass('unfav') ) {
190
  var type = target.hasClass('fav') ? 'fav' : 'unfav';
191
+ var parent = target.closest('.activity-item');
192
  var parent_id = parent.attr('id').substr( 9, parent.attr('id').length );
193
 
194
  target.addClass('loading');
bp-themes/bp-default/footer.php CHANGED
@@ -15,13 +15,13 @@
15
  <p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ); ?></p>
16
  </div>
17
 
18
- <?php do_action( 'bp_in_footer' ); ?>
19
 
20
  </div><!-- #footer -->
21
 
22
  <?php do_action( 'bp_after_footer' ); ?>
23
 
24
- <?php wp_footer(); // @see bp_footer(); ?>
25
 
26
  </body>
27
 
15
  <p><?php printf( __( 'Proudly powered by <a href="%1$s">WordPress</a> and <a href="%2$s">BuddyPress</a>.', 'buddypress' ), 'http://wordpress.org', 'http://buddypress.org' ); ?></p>
16
  </div>
17
 
18
+ <?php do_action( 'bp_footer' ); ?>
19
 
20
  </div><!-- #footer -->
21
 
22
  <?php do_action( 'bp_after_footer' ); ?>
23
 
24
+ <?php wp_footer(); ?>
25
 
26
  </body>
27
 
bp-themes/bp-default/header.php CHANGED
@@ -7,7 +7,8 @@
7
  <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title>
8
  <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
9
 
10
- <?php wp_head(); // @see bp_head(); ?>
 
11
 
12
  </head>
13
 
7
  <title><?php wp_title( '|', true, 'right' ); bloginfo( 'name' ); ?></title>
8
  <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
9
 
10
+ <?php do_action( 'bp_head' ); ?>
11
+ <?php wp_head(); ?>
12
 
13
  </head>
14
 
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-beta2
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-RC1
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-beta2
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-RC1
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-xprofile/bp-xprofile-classes.php CHANGED
@@ -175,7 +175,7 @@ class BP_XProfile_Group {
175
  if ( empty( $fields ) )
176
  return $groups;
177
 
178
- if ( !empty( $fetch_field_data ) ) {
179
 
180
  // Fetch the field data for the user.
181
  foreach( (array) $fields as $field ) {
@@ -303,7 +303,7 @@ class BP_XProfile_Group {
303
 
304
  foreach( (array)$fields as $key => $field ) {
305
  // Does the admin allow this field to be customized?
306
- $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'enabled' == $admin_set_levels[$field->id]['allow_custom'];
307
 
308
  // Look to see if the user has set the visibility for this field
309
  if ( $allow_custom && isset( $visibility_levels[$field->id] ) ) {
@@ -727,9 +727,7 @@ class BP_XProfile_Field {
727
  $default_input = 'radio';
728
  }
729
 
730
- if ( $this->type != $type ) {
731
- $class = 'display: none;';
732
- }
733
 
734
  if ( empty( $this->default_visibility ) ) {
735
  $this->default_visibility = 'public';
175
  if ( empty( $fields ) )
176
  return $groups;
177
 
178
+ if ( ! empty( $fetch_field_data ) && ! empty( $user_id ) ) {
179
 
180
  // Fetch the field data for the user.
181
  foreach( (array) $fields as $field ) {
303
 
304
  foreach( (array)$fields as $key => $field ) {
305
  // Does the admin allow this field to be customized?
306
+ $allow_custom = empty( $admin_set_levels[$field->id]['allow_custom'] ) || 'allowed' == $admin_set_levels[$field->id]['allow_custom'];
307
 
308
  // Look to see if the user has set the visibility for this field
309
  if ( $allow_custom && isset( $visibility_levels[$field->id] ) ) {
727
  $default_input = 'radio';
728
  }
729
 
730
+ $class = $this->type != $type ? 'display: none;' : '';
 
 
731
 
732
  if ( empty( $this->default_visibility ) ) {
733
  $this->default_visibility = 'public';
readme.txt CHANGED
@@ -2,7 +2,7 @@
2
  Contributors: apeatling, johnjamesjacoby, MrMaz, 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.4
5
- Tested up to: 3.4
6
  Stable tag: 1.5.6
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
2
  Contributors: apeatling, johnjamesjacoby, MrMaz, 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.4
5
+ Tested up to: 3.4.1
6
  Stable tag: 1.5.6
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html