BuddyPress - Version 2.0-beta2

Version Description

= 1.9.2 = See: http://codex.buddypress.org/releases/version-1-9-2/

= 1.9.1 = See: http://codex.buddypress.org/releases/version-1-9-1/

= 1.9 = See: http://codex.buddypress.org/releases/version-1-9/

= 1.8.1 = See: http://codex.buddypress.org/releases/version-1-8-1/

= 1.8 = See: http://codex.buddypress.org/releases/version-1-8/

= 1.7.3 = See: http://codex.buddypress.org/releases/version-1-7-3/

= 1.7.2 = See: http://codex.buddypress.org/releases/version-1-7-2/

= 1.7.1 = See: http://codex.buddypress.org/releases/version-1-7-1/

= 1.7 = See: http://codex.buddypress.org/releases/version-1-7/

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

= 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 boonebgorges
Plugin Icon 128x128 BuddyPress
Version 2.0-beta2
Comparing to
See all releases

Code changes from version 2.0-beta1 to 2.0-beta2

Files changed (49) hide show
  1. bp-activity/admin/css/admin.min.css +1 -1
  2. bp-activity/admin/js/admin.min.js +1 -1
  3. bp-activity/bp-activity-classes.php +48 -6
  4. bp-activity/bp-activity-filters.php +37 -11
  5. bp-activity/bp-activity-functions.php +1 -1
  6. bp-activity/bp-activity-loader.php +2 -2
  7. bp-activity/bp-activity-template.php +4 -3
  8. bp-blogs/bp-blogs-functions.php +2 -2
  9. bp-blogs/bp-blogs-loader.php +1 -1
  10. bp-core/admin/bp-core-components.php +1 -0
  11. bp-core/admin/css/common.min.css +1 -1
  12. bp-core/bp-core-admin.php +56 -59
  13. bp-core/bp-core-avatars.php +1 -1
  14. bp-core/bp-core-loader.php +1 -1
  15. bp-core/css/buddybar.min.css +1 -1
  16. bp-core/js/confirm.min.js +1 -7
  17. bp-forums/bp-forums-loader.php +1 -1
  18. bp-friends/bp-friends-loader.php +1 -1
  19. bp-groups/bp-groups-activity.php +7 -5
  20. bp-groups/bp-groups-admin.php +3 -3
  21. bp-groups/bp-groups-loader.php +1 -1
  22. bp-groups/bp-groups-template.php +19 -2
  23. bp-languages/buddypress.pot +810 -755
  24. bp-loader.php +2 -2
  25. bp-members/admin/bp-members-classes.php +2 -2
  26. bp-members/admin/css/admin.css +15 -0
  27. bp-members/admin/css/admin.min.css +1 -1
  28. bp-members/admin/js/admin.min.js +1 -1
  29. bp-members/bp-members-admin.php +4 -10
  30. bp-members/bp-members-loader.php +1 -1
  31. bp-messages/bp-messages-loader.php +1 -1
  32. bp-messages/bp-messages-notifications.php +1 -1
  33. bp-messages/css/autocomplete/jquery.autocompletefb.min.css +1 -1
  34. bp-messages/js/autocomplete/jquery.autocomplete.min.js +1 -1
  35. bp-messages/js/autocomplete/jquery.autocompletefb.min.js +1 -1
  36. bp-notifications/bp-notifications-loader.php +1 -1
  37. bp-templates/bp-legacy/buddypress-functions.php +5 -5
  38. bp-templates/bp-legacy/buddypress/members/single/settings/profile.php +20 -16
  39. bp-templates/bp-legacy/css/buddypress-rtl.css +10 -0
  40. bp-templates/bp-legacy/css/buddypress.css +10 -0
  41. bp-templates/bp-legacy/js/buddypress.js +50 -22
  42. bp-themes/bp-default/members/single/settings/profile.php +20 -16
  43. bp-xprofile/admin/css/admin.min.css +1 -1
  44. bp-xprofile/admin/js/admin.min.js +1 -1
  45. bp-xprofile/bp-xprofile-activity.php +5 -2
  46. bp-xprofile/bp-xprofile-admin.php +6 -3
  47. bp-xprofile/bp-xprofile-loader.php +1 -1
  48. bp-xprofile/bp-xprofile-template.php +85 -37
  49. humans.txt +11 -1
bp-activity/admin/css/admin.min.css CHANGED
@@ -1 +1 @@
1
- .akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-left:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%;}
1
+ .akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}.akismet-history{margin:13px}.akismet-history div{margin-bottom:13px}.akismet-history span{color:#999}#wp-bp-activities-wrap{padding:5px 0}#bp-activities{height:120px}#bp-replyhead{font-size:1em;line-height:1.4em;margin:0}#bp-replysubmit{margin:0;padding:0 0 3px;text-align:center}#bp-replysubmit .error{color:red;line-height:21px;text-align:center;vertical-align:center}#bp-replysubmit img.waiting{float:right;padding:4px 10px 0;vertical-align:top}#bp-activities-form .column-response img{float:left;margin-right:10px;margin-top:1px}.activity-errors{list-style-type:disc;margin-left:2em}#bp_activity_action div.inside,#bp_activity_content div.inside{line-height:0}#bp_activity_action h3,#bp_activity_content h3{cursor:auto}#bp_activity_action td.mceIframeContainer,#bp_activity_content td.mceIframeContainer{background-color:white}#post-body #bp-activities-action_resize,#post-body #bp-activities-content_resize{position:inherit;margin-top:-2px}#bp_activity_link input{width:99%}#bp-activities-primaryid{margin-bottom:1em}.column-action{width:12%}
bp-activity/admin/js/admin.min.js CHANGED
@@ -1 +1 @@
1
- (function(e){var t={init:function(){e(document).on("click",".row-actions a.reply",t.open);e(document).on("click","#bp-activities-container a.cancel",t.close);e(document).on("click","#bp-activities-container a.save",t.send);e(document).on("keyup","#bp-activities:visible",function(e){if(27==e.which){t.close()}})},open:function(t){var n=e("#bp-activities-container").hide();e(this).parents("tr").after(n);n.fadeIn("300");e("#bp-activities").focus();return false},close:function(t){e("#bp-activities-container").fadeOut("200",function(){e("#bp-activities").val("").blur();e("#bp-replysubmit .error").html("").hide();e("#bp-replysubmit .waiting").hide()});return false},send:function(n){e("#bp-replysubmit .error").hide();e("#bp-replysubmit .waiting").show();var r={};r["_ajax_nonce-bp-activity-admin-reply"]=e('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val();r.action="bp-activity-admin-reply";r.content=e("#bp-activities").val();r.parent_id=e("#bp-activities-container").prev().data("parent_id");r.root_id=e("#bp-activities-container").prev().data("root_id");e.ajax({data:r,type:"POST",url:ajaxurl,error:function(e){t.error(e)},success:function(e){t.show(e)}});return false},error:function(t){var n=t.statusText;e("#bp-replysubmit .waiting").hide();if(t.responseText){n=t.responseText.replace(/<.[^<>]*?>/g,"")}if(n){e("#bp-replysubmit .error").html(n).show()}},show:function(n){var r,i,s;if(typeof n=="string"){t.error({responseText:n});return false}s=wpAjax.parseAjaxResponse(n);if(s.errors){t.error({responseText:wpAjax.broken});return false}s=s.responses[0];e("#bp-activities-container").fadeOut("200",function(){e("#bp-activities").val("").blur();e("#bp-replysubmit .error").html("").hide();e("#bp-replysubmit .waiting").hide();e("#bp-activities-container").before(s.data);i=e("#activity-"+s.id);r=i.closest(".widefat").css("backgroundColor");i.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:r},300)})}};e(document).ready(function(){t.init();e("#bp_activity_action h3, #bp_activity_content h3").unbind("click");postboxes.add_postbox_toggles(bp_activity_admin_vars.page)})})(jQuery)
1
+ (function(b){var a={init:function(){b(document).on("click",".row-actions a.reply",a.open);b(document).on("click","#bp-activities-container a.cancel",a.close);b(document).on("click","#bp-activities-container a.save",a.send);b(document).on("keyup","#bp-activities:visible",function(c){if(27==c.which){a.close()}})},open:function(d){var c=b("#bp-activities-container").hide();b(this).parents("tr").after(c);c.fadeIn("300");b("#bp-activities").focus();return false},close:function(c){b("#bp-activities-container").fadeOut("200",function(){b("#bp-activities").val("").blur();b("#bp-replysubmit .error").html("").hide();b("#bp-replysubmit .waiting").hide()});return false},send:function(d){b("#bp-replysubmit .error").hide();b("#bp-replysubmit .waiting").show();var c={};c["_ajax_nonce-bp-activity-admin-reply"]=b('#bp-activities-container input[name="_ajax_nonce-bp-activity-admin-reply"]').val();c.action="bp-activity-admin-reply";c.content=b("#bp-activities").val();c.parent_id=b("#bp-activities-container").prev().data("parent_id");c.root_id=b("#bp-activities-container").prev().data("root_id");b.ajax({data:c,type:"POST",url:ajaxurl,error:function(e){a.error(e)},success:function(e){a.show(e)}});return false},error:function(c){var d=c.statusText;b("#bp-replysubmit .waiting").hide();if(c.responseText){d=c.responseText.replace(/<.[^<>]*?>/g,"")}if(d){b("#bp-replysubmit .error").html(d).show()}},show:function(d){var e,f,c;if(typeof(d)=="string"){a.error({responseText:d});return false}c=wpAjax.parseAjaxResponse(d);if(c.errors){a.error({responseText:wpAjax.broken});return false}c=c.responses[0];b("#bp-activities-container").fadeOut("200",function(){b("#bp-activities").val("").blur();b("#bp-replysubmit .error").html("").hide();b("#bp-replysubmit .waiting").hide();b("#bp-activities-container").before(c.data);f=b("#activity-"+c.id);e=f.closest(".widefat").css("backgroundColor");f.animate({backgroundColor:"#CEB"},300).animate({backgroundColor:e},300)})}};b(document).ready(function(){a.init();b("#bp_activity_action h3, #bp_activity_content h3").unbind("click");postboxes.add_postbox_toggles(bp_activity_admin_vars.page)})})(jQuery);
bp-activity/bp-activity-classes.php CHANGED
@@ -1013,7 +1013,24 @@ class BP_Activity_Activity {
1013
  $parent_id = $r->secondary_item_id;
1014
  while ( $parent_id !== $r->item_id ) {
1015
  $depth++;
1016
- $parent_id = $ref[ $parent_id ]->secondary_item_id;
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1017
  }
1018
  $r->depth = $depth;
1019
  }
@@ -1088,13 +1105,25 @@ class BP_Activity_Activity {
1088
  }
1089
 
1090
  /**
1091
- * Get a list of components that have recorded activity associated with them
1092
  *
 
 
 
 
 
1093
  * @return array List of component names.
1094
  */
1095
- public static function get_recorded_components() {
1096
  global $wpdb, $bp;
1097
- return $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
 
 
 
 
 
 
 
1098
  }
1099
 
1100
  /**
@@ -1160,8 +1189,7 @@ class BP_Activity_Activity {
1160
  * @since BuddyPress (1.5.0)
1161
  *
1162
  * @param array $filter_array {
1163
- * Fields and values to filter by. Each can be either a single
1164
- * string, a comma-separated list, or an array of values.
1165
  * @type array|string|id $user_id User ID(s).
1166
  * @type array|string $object Corresponds to the 'component'
1167
  * column in the database.
@@ -1171,6 +1199,11 @@ class BP_Activity_Activity {
1171
  * column in the database.
1172
  * @type array|string|int $secondary_id Corresponds to the
1173
  * 'secondary_item_id' column in the database.
 
 
 
 
 
1174
  * }
1175
  * @return string The filter clause, for use in a SQL query.
1176
  */
@@ -1213,6 +1246,15 @@ class BP_Activity_Activity {
1213
  $filter_sql[] = "a.id >= {$sid_sql}";
1214
  }
1215
 
 
 
 
 
 
 
 
 
 
1216
  if ( empty( $filter_sql ) )
1217
  return false;
1218
 
1013
  $parent_id = $r->secondary_item_id;
1014
  while ( $parent_id !== $r->item_id ) {
1015
  $depth++;
1016
+
1017
+ // When display_comments=stream, the
1018
+ // parent comment may not be part of
1019
+ // the returned results, so we manually
1020
+ // fetch it
1021
+ if ( empty( $ref[ $parent_id ] ) ) {
1022
+ $direct_parent = new BP_Activity_Activity( $parent_id );
1023
+ if ( isset( $direct_parent->secondary_item_id ) ) {
1024
+ $parent_id = $direct_parent->secondary_item_id;
1025
+ } else {
1026
+ // Something went wrong
1027
+ // Short-circuit the
1028
+ // depth calculation
1029
+ $parent_id = $r->item_id;
1030
+ }
1031
+ } else {
1032
+ $parent_id = $ref[ $parent_id ]->secondary_item_id;
1033
+ }
1034
  }
1035
  $r->depth = $depth;
1036
  }
1105
  }
1106
 
1107
  /**
1108
+ * Get a list of components that have recorded activity associated with them.
1109
  *
1110
+ * @param bool $skip_last_activity If true, components will not be
1111
+ * included if the only activity type associated with them is
1112
+ * 'last_activity'. (Since 2.0.0, 'last_activity' is stored in
1113
+ * the activity table, but these items are not full-fledged
1114
+ * activity items.) Default: true.
1115
  * @return array List of component names.
1116
  */
1117
+ public static function get_recorded_components( $skip_last_activity = true ) {
1118
  global $wpdb, $bp;
1119
+
1120
+ if ( $skip_last_activity ) {
1121
+ $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} WHERE action != '' AND action != 'last_activity' ORDER BY component ASC" );
1122
+ } else {
1123
+ $components = $wpdb->get_col( "SELECT DISTINCT component FROM {$bp->activity->table_name} ORDER BY component ASC" );
1124
+ }
1125
+
1126
+ return $components;
1127
  }
1128
 
1129
  /**
1189
  * @since BuddyPress (1.5.0)
1190
  *
1191
  * @param array $filter_array {
1192
+ * Fields and values to filter by.
 
1193
  * @type array|string|id $user_id User ID(s).
1194
  * @type array|string $object Corresponds to the 'component'
1195
  * column in the database.
1199
  * column in the database.
1200
  * @type array|string|int $secondary_id Corresponds to the
1201
  * 'secondary_item_id' column in the database.
1202
+ * @type int $offset Return only those items with an ID greater
1203
+ * than the offset value.
1204
+ * @type string $since Return only those items that have a
1205
+ * date_recorded value greater than a given MySQL-formatted
1206
+ * date.
1207
  * }
1208
  * @return string The filter clause, for use in a SQL query.
1209
  */
1246
  $filter_sql[] = "a.id >= {$sid_sql}";
1247
  }
1248
 
1249
+ if ( ! empty( $filter_array['since'] ) ) {
1250
+ // Validate that this is a proper Y-m-d H:i:s date
1251
+ // Trick: parse to UNIX date then translate back
1252
+ $translated_date = date( 'Y-m-d H:i:s', strtotime( $filter_array['since'] ) );
1253
+ if ( $translated_date === $filter_array['since'] ) {
1254
+ $filter_sql[] = "a.date_recorded > '{$translated_date}'";
1255
+ }
1256
+ }
1257
+
1258
  if ( empty( $filter_sql ) )
1259
  return false;
1260
 
bp-activity/bp-activity-filters.php CHANGED
@@ -182,7 +182,6 @@ function bp_activity_filter_kses( $content ) {
182
  $activity_allowedtags['img'] = array();
183
  $activity_allowedtags['img']['src'] = array();
184
  $activity_allowedtags['img']['alt'] = array();
185
- $activity_allowedtags['img']['class'] = array();
186
  $activity_allowedtags['img']['width'] = array();
187
  $activity_allowedtags['img']['height'] = array();
188
  $activity_allowedtags['img']['class'] = array();
@@ -430,7 +429,7 @@ add_filter( 'bp_core_get_js_dependencies', 'bp_activity_get_js_dependencies', 10
430
  function bp_activity_newest_class( $classes = '' ) {
431
  $bp = buddypress();
432
 
433
- if ( ! empty( $bp->activity->new_update_id ) && $bp->activity->new_update_id == bp_get_activity_id() ) {
434
  $classes .= ' new-update';
435
  }
436
 
@@ -438,13 +437,39 @@ function bp_activity_newest_class( $classes = '' ) {
438
  return $classes;
439
  }
440
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
441
  /**
442
  * Use WordPress Heartbeat API to check for latest activity update.
443
  *
444
  * @since BuddyPress (2.0.0)
445
  *
446
  * @uses bp_activity_get_last_updated() to get the recorded date of the last activity
447
-
448
  * @param array $response
449
  * @param array $data
450
  * @return array $response
@@ -452,7 +477,7 @@ function bp_activity_newest_class( $classes = '' ) {
452
  function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) {
453
  $bp = buddypress();
454
 
455
- if ( empty( $data['bp_activity_last_id'] ) ) {
456
  return $response;
457
  }
458
 
@@ -460,12 +485,12 @@ function bp_activity_heartbeat_last_recorded( $response = array(), $data = array
460
  // filters), but force the offset to get only new items
461
  $activity_latest_args = bp_parse_args(
462
  bp_ajax_querystring( 'activity' ),
463
- array( 'offset' => absint( $data['bp_activity_last_id'] ) + 1 ),
464
  'activity_latest_args'
465
  );
466
 
467
  $newest_activities = array();
468
- $last_activity_id = 0;
469
 
470
  // Temporarly add a just-posted class for new activity items
471
  add_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
@@ -475,22 +500,23 @@ function bp_activity_heartbeat_last_recorded( $response = array(), $data = array
475
  while ( bp_activities() ) {
476
  bp_the_activity();
477
 
478
- if ( $last_activity_id < bp_get_activity_id() ) {
479
- $last_activity_id = bp_get_activity_id();
 
480
  }
481
 
482
  bp_get_template_part( 'activity/entry' );
483
  }
484
  }
485
 
486
- $newest_activities['activities'] = ob_get_contents();
487
- $newest_activities['last_id'] = $last_activity_id;
488
  ob_end_clean();
489
 
490
  // Remove the temporary filter
491
  remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
492
 
493
- if ( ! empty( $newest_activities['last_id'] ) ) {
494
  $response['bp_activity_newest_activities'] = $newest_activities;
495
  }
496
 
182
  $activity_allowedtags['img'] = array();
183
  $activity_allowedtags['img']['src'] = array();
184
  $activity_allowedtags['img']['alt'] = array();
 
185
  $activity_allowedtags['img']['width'] = array();
186
  $activity_allowedtags['img']['height'] = array();
187
  $activity_allowedtags['img']['class'] = array();
429
  function bp_activity_newest_class( $classes = '' ) {
430
  $bp = buddypress();
431
 
432
+ if ( ! empty( $bp->activity->last_recorded ) && $bp->activity->last_recorded == bp_get_activity_date_recorded() ) {
433
  $classes .= ' new-update';
434
  }
435
 
437
  return $classes;
438
  }
439
 
440
+ /**
441
+ * Check if Activity Heartbeat feature i on to add a timestamp class.
442
+ *
443
+ * @since BuddyPress (2.0.0)
444
+ *
445
+ * @param string $classes
446
+ * @return string $classes
447
+ */
448
+ function bp_activity_timestamp_class( $classes = '' ) {
449
+
450
+ if ( ! bp_activity_do_heartbeat() ) {
451
+ return $classes;
452
+ }
453
+
454
+ $activity_date = bp_get_activity_date_recorded();
455
+
456
+ if ( empty( $activity_date ) ) {
457
+ return $classes;
458
+ }
459
+
460
+ $classes .= ' date-recorded-' . strtotime( $activity_date );
461
+
462
+ return $classes;
463
+ }
464
+ add_filter( 'bp_get_activity_css_class', 'bp_activity_timestamp_class', 9, 1 );
465
+
466
  /**
467
  * Use WordPress Heartbeat API to check for latest activity update.
468
  *
469
  * @since BuddyPress (2.0.0)
470
  *
471
  * @uses bp_activity_get_last_updated() to get the recorded date of the last activity
472
+ *
473
  * @param array $response
474
  * @param array $data
475
  * @return array $response
477
  function bp_activity_heartbeat_last_recorded( $response = array(), $data = array() ) {
478
  $bp = buddypress();
479
 
480
+ if ( empty( $data['bp_activity_last_recorded'] ) ) {
481
  return $response;
482
  }
483
 
485
  // filters), but force the offset to get only new items
486
  $activity_latest_args = bp_parse_args(
487
  bp_ajax_querystring( 'activity' ),
488
+ array( 'since' => date( 'Y-m-d H:i:s', $data['bp_activity_last_recorded'] ) ),
489
  'activity_latest_args'
490
  );
491
 
492
  $newest_activities = array();
493
+ $last_activity_recorded = 0;
494
 
495
  // Temporarly add a just-posted class for new activity items
496
  add_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
500
  while ( bp_activities() ) {
501
  bp_the_activity();
502
 
503
+ $atime = strtotime( bp_get_activity_date_recorded() );
504
+ if ( $last_activity_recorded < $atime ) {
505
+ $last_activity_recorded = $atime;
506
  }
507
 
508
  bp_get_template_part( 'activity/entry' );
509
  }
510
  }
511
 
512
+ $newest_activities['activities'] = ob_get_contents();
513
+ $newest_activities['last_recorded'] = $last_activity_recorded;
514
  ob_end_clean();
515
 
516
  // Remove the temporary filter
517
  remove_filter( 'bp_get_activity_css_class', 'bp_activity_newest_class', 10, 1 );
518
 
519
+ if ( ! empty( $newest_activities['last_recorded'] ) ) {
520
  $response['bp_activity_newest_activities'] = $newest_activities;
521
  }
522
 
bp-activity/bp-activity-functions.php CHANGED
@@ -427,7 +427,7 @@ function bp_activity_add_user_favorite( $activity_id, $user_id = 0 ) {
427
  bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
428
 
429
  // Update activity meta counts
430
- if ( true === bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
431
 
432
  // Execute additional code
433
  do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
427
  bp_update_user_meta( $user_id, 'bp_favorite_activities', $my_favs );
428
 
429
  // Update activity meta counts
430
+ if ( bp_activity_update_meta( $activity_id, 'favorite_count', $fav_count ) ) {
431
 
432
  // Execute additional code
433
  do_action( 'bp_activity_add_user_favorite', $activity_id, $user_id );
bp-activity/bp-activity-loader.php CHANGED
@@ -328,7 +328,7 @@ class BP_Activity_Component extends BP_Component {
328
  * @uses bp_is_my_profile()
329
  * @uses bp_core_fetch_avatar()
330
  */
331
- function setup_title() {
332
  $bp = buddypress();
333
 
334
  // Adjust title based on view
@@ -353,7 +353,7 @@ class BP_Activity_Component extends BP_Component {
353
  *
354
  * @since BuddyPress (1.6)
355
  */
356
- function setup_actions() {
357
  // Spam prevention
358
  add_action( 'bp_include', 'bp_activity_setup_akismet' );
359
 
328
  * @uses bp_is_my_profile()
329
  * @uses bp_core_fetch_avatar()
330
  */
331
+ public function setup_title() {
332
  $bp = buddypress();
333
 
334
  // Adjust title based on view
353
  *
354
  * @since BuddyPress (1.6)
355
  */
356
+ public function setup_actions() {
357
  // Spam prevention
358
  add_action( 'bp_include', 'bp_activity_setup_akismet' );
359
 
bp-activity/bp-activity-template.php CHANGED
@@ -547,6 +547,7 @@ function bp_has_activities( $args = '' ) {
547
  'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
548
  'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
549
  'offset' => false, // return only items >= this ID
 
550
 
551
  'meta_query' => false, // filter on activity meta. See WP_Meta_Query for format
552
 
@@ -641,8 +642,8 @@ function bp_has_activities( $args = '' ) {
641
  // into bp-custom.php or your theme's functions.php
642
  if ( isset( $_GET['afilter'] ) && apply_filters( 'bp_activity_enable_afilter_support', false ) )
643
  $filter = array( 'object' => $_GET['afilter'] );
644
- else if ( ! empty( $user_id ) || ! empty( $object ) || ! empty( $action ) || ! empty( $primary_id ) || ! empty( $secondary_id ) || ! empty( $offset ) )
645
- $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id, 'offset' => $offset );
646
  else
647
  $filter = false;
648
 
@@ -2805,7 +2806,7 @@ function bp_send_public_message_link() {
2805
  */
2806
  function bp_activity_recurse_comments_activity_ids( $activity = array(), $activity_ids = array() ) {
2807
  if ( is_array( $activity ) && ! empty( $activity['activities'] ) ) {
2808
- $activity = $activity['activities'][0];
2809
  }
2810
 
2811
  if ( ! empty( $activity->children ) ) {
547
  'primary_id' => $primary_id, // object ID to filter on e.g. a group_id or forum_id or blog_id etc.
548
  'secondary_id' => false, // secondary object ID to filter on e.g. a post_id
549
  'offset' => false, // return only items >= this ID
550
+ 'since' => false, // return only items recorded since this Y-m-d H:i:s date
551
 
552
  'meta_query' => false, // filter on activity meta. See WP_Meta_Query for format
553
 
642
  // into bp-custom.php or your theme's functions.php
643
  if ( isset( $_GET['afilter'] ) && apply_filters( 'bp_activity_enable_afilter_support', false ) )
644
  $filter = array( 'object' => $_GET['afilter'] );
645
+ else if ( ! empty( $user_id ) || ! empty( $object ) || ! empty( $action ) || ! empty( $primary_id ) || ! empty( $secondary_id ) || ! empty( $offset ) || ! empty( $since ) )
646
+ $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id, 'offset' => $offset, 'since' => $since );
647
  else
648
  $filter = false;
649
 
2806
  */
2807
  function bp_activity_recurse_comments_activity_ids( $activity = array(), $activity_ids = array() ) {
2808
  if ( is_array( $activity ) && ! empty( $activity['activities'] ) ) {
2809
+ $activity = $activity['activities'][0];
2810
  }
2811
 
2812
  if ( ! empty( $activity->children ) ) {
bp-blogs/bp-blogs-functions.php CHANGED
@@ -630,7 +630,6 @@ function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
630
 
631
  // find the parent 'new_blog_post' activity entry
632
  $parent_activity_id = bp_activity_get_activity_id( array(
633
- 'user_id' => $user_id,
634
  'component' => 'blogs',
635
  'type' => 'new_blog_post',
636
  'item_id' => $blog_id,
@@ -973,6 +972,7 @@ function bp_blogs_transition_activity_status( $new_status, $old_status, $comment
973
  * If a blog comment transitions to a "delete" or "hold" status, delete the activity item.
974
  * If a blog comment transitions to trashed, or spammed, mark the activity as spam.
975
  * If a blog comment transitions to approved (and the activity exists), mark the activity as ham.
 
976
  * Otherwise, record the comment into the activity stream.
977
  */
978
 
@@ -981,7 +981,7 @@ function bp_blogs_transition_activity_status( $new_status, $old_status, $comment
981
  return bp_blogs_remove_comment( $comment->comment_ID );
982
 
983
  // These clauses handle trash, spam, and un-spams.
984
- } elseif ( in_array( $new_status, array( 'trash', 'spam' ) ) ) {
985
  $action = 'spam_activity';
986
  } elseif ( 'approved' == $new_status ) {
987
  $action = 'ham_activity';
630
 
631
  // find the parent 'new_blog_post' activity entry
632
  $parent_activity_id = bp_activity_get_activity_id( array(
 
633
  'component' => 'blogs',
634
  'type' => 'new_blog_post',
635
  'item_id' => $blog_id,
972
  * If a blog comment transitions to a "delete" or "hold" status, delete the activity item.
973
  * If a blog comment transitions to trashed, or spammed, mark the activity as spam.
974
  * If a blog comment transitions to approved (and the activity exists), mark the activity as ham.
975
+ * If a blog comment transitions to unapproved (and the activity exists), mark the activity as spam.
976
  * Otherwise, record the comment into the activity stream.
977
  */
978
 
981
  return bp_blogs_remove_comment( $comment->comment_ID );
982
 
983
  // These clauses handle trash, spam, and un-spams.
984
+ } elseif ( in_array( $new_status, array( 'trash', 'spam', 'unapproved' ) ) ) {
985
  $action = 'spam_activity';
986
  } elseif ( 'approved' == $new_status ) {
987
  $action = 'ham_activity';
bp-blogs/bp-blogs-loader.php CHANGED
@@ -217,7 +217,7 @@ class BP_Blogs_Component extends BP_Component {
217
  /**
218
  * Set up the title for pages and <title>
219
  */
220
- function setup_title() {
221
  $bp = buddypress();
222
 
223
  // Set up the component options navigation for Site
217
  /**
218
  * Set up the title for pages and <title>
219
  */
220
+ public function setup_title() {
221
  $bp = buddypress();
222
 
223
  // Set up the component options navigation for Site
bp-core/admin/bp-core-components.php CHANGED
@@ -262,6 +262,7 @@ function bp_core_admin_components_settings_handler() {
262
 
263
  // Redirect
264
  wp_redirect( $base_url );
 
265
  }
266
  add_action( 'bp_admin_init', 'bp_core_admin_components_settings_handler' );
267
 
262
 
263
  // Redirect
264
  wp_redirect( $base_url );
265
+ die();
266
  }
267
  add_action( 'bp_admin_init', 'bp_core_admin_components_settings_handler' );
268
 
bp-core/admin/css/common.min.css CHANGED
@@ -1 +1 @@
1
- body.branch-3-6 div#icon-buddypress,body.branch-3-7 div#icon-buddypress{background:url('../images/icons32.png') no-repeat -370px -6px}body.branch-3-6 div#icon-buddypress-activity,body.branch-3-7 div#icon-buddypress-activity{background:url('../images/icons32.png') no-repeat -10px -6px}body.branch-3-6 div#icon-buddypress-groups,body.branch-3-7 div#icon-buddypress-groups{background:url('../images/icons32.png') no-repeat -250px -6px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{background-image:url('../images/menu.png') !important;background-position:-178px -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image{background-position:-178px -2px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image{background-image:url('../images/menu.png');background-position:0 -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image{background-position:0 -2px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image{background-image:url('../images/menu.png');background-position:-61px -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image{background-position:-61px -2px}th.column-gid{width:60px}td.column-gid{vertical-align:middle}table.bp-group-members th,table.bp-group-members td{padding:5px 0}table.bp-group-members .uid-column{padding-left:20px;padding-right:20px}table.bp-group-members .uname-column{width:70%}table.bp-group-members .urole-column{padding-left:20px;padding-right:20px}#adminmenu #toplevel_page_bp-activity .wp-menu-image:before,#adminmenu #toplevel_page_bp-activity_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before{content:"\f452"}#adminmenu #toplevel_page_bp-groups .wp-menu-image:before,#adminmenu #toplevel_page_bp-groups_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before{content:"\f456"}#adminmenu #toplevel_page_bp-notifications .wp-menu-image:before,#adminmenu #toplevel_page_bp-notifications_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-notifications_network .wp-menu-image:before{content:"\f439"}#adminmenu #toplevel_page_bp-messages .wp-menu-image:before,#adminmenu #toplevel_page_bp-messages_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-messages_network .wp-menu-image:before{content:"\f457"}#adminmenu #toplevel_page_bp-friends .wp-menu-image:before,#adminmenu #toplevel_page_bp-friends_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-friends_network .wp-menu-image:before{content:"\f454"}#adminmenu #toplevel_page_bp-settings .wp-menu-image:before,#adminmenu #toplevel_page_bp-settings_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-settings_network .wp-menu-image:before{content:"\f108"}#adminmenu li.toplevel_page_bp-components .wp-menu-image,#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{content:"\f448"}body.branch-3-6 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,body.branch-3-6 #adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,body.branch-3-7 #adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{content:""}.settings_page_bp-components td.plugin-title span{float:left;width:18px;height:18px;margin-right:5px}.settings_page_bp-components td.plugin-title span:before{font-family:'dashicons';font-size:18px}.settings_page_bp-components tr.activity td.plugin-title span:before{content:"\f452"}.settings_page_bp-components tr.notifications td.plugin-title span:before{content:"\f339"}.settings_page_bp-components tr.xprofile td.plugin-title span:before{content:"\f336"}.settings_page_bp-components tr.settings td.plugin-title span:before{content:"\f108"}.settings_page_bp-components tr.groups td.plugin-title span:before{content:"\f456"}.settings_page_bp-components tr.messages td.plugin-title span:before{content:"\f457"}.settings_page_bp-components tr.forums td.plugin-title span:before{content:"\f452"}.settings_page_bp-components tr.blogs td.plugin-title span:before{content:"\f120"}.settings_page_bp-components tr.friends td.plugin-title span:before{content:"\f454"}body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.notifications td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span:before{content:""}body.branch-3-6.settings_page_bp-components td.plugin-title span,body.branch-3-7.settings_page_bp-components td.plugin-title span{background-image:url('../images/menu.png');background-position:-4px -40px;background-repeat:no-repeat}body.branch-3-6.settings_page_bp-components tr.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.active td.plugin-title span{background-position-y:-7px}body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span{background-position:-4px -40px}body.branch-3-6.settings_page_bp-components tr.activity.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.activity.active td.plugin-title span{background-position:-4px -7px}body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-305px -40px}body.branch-3-6.settings_page_bp-components tr.xprofile.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.xprofile.active td.plugin-title span{background-position:-305px -7px}body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-334px -40px}body.branch-3-6.settings_page_bp-components tr.settings.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.settings.active td.plugin-title span{background-position:-334px -7px}body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span{background-position:-66px -40px}body.branch-3-6.settings_page_bp-components tr.groups.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.groups.active td.plugin-title span{background-position:-66px -7px}body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span{background-position:-154px -40px}body.branch-3-6.settings_page_bp-components tr.messages.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.messages.active td.plugin-title span{background-position:-154px -7px}body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-36px -40px}body.branch-3-6.settings_page_bp-components tr.forums.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.forums.active td.plugin-title span{background-position:-36px -7px}body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span{background-position:-125px -40px}body.branch-3-6.settings_page_bp-components tr.blogs.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.blogs.active td.plugin-title span{background-position:-125px -7px}body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span{background-position:-95px -40px}body.branch-3-6.settings_page_bp-components tr.friends.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.friends.active td.plugin-title span{background-position:-95px -7px}body.branch-3-6.settings_page_bp-components tr.core td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.core td.plugin-title span{background-position:-184px -40px}body.branch-3-6.settings_page_bp-components tr.core.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.core.active td.plugin-title span{background-position:-184px -7px}body.branch-3-6.settings_page_bp-components tr.members td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.members td.plugin-title span{background-position:-36px -40px}body.branch-3-6.settings_page_bp-components tr.members.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.members.active td.plugin-title span{background-position:-36px -7px}#bp-admin-component-form .widefat th{display:table-cell;vertical-align:top}.bp-badge{padding-top:142px;height:50px;width:173px;color:#fafafa;font-weight:bold;font-size:14px;text-align:center;margin:0 -5px;background:url('../images/badge.png') no-repeat}.about-wrap .bp-badge{position:absolute;top:0;right:0}body.rtl .about-wrap .bp-badge{right:auto;left:0}@media only screen and (-webkit-min-device-pixel-ratio:1.5){body.branch-3-6 div#icon-buddypress,body.branch-3-6 div#icon-buddypress-activity,body.branch-3-6 div#icon-buddypress-groups,body.branch-3-7 div#icon-buddypress,body.branch-3-7 div#icon-buddypress-activity,body.branch-3-7 div#icon-buddypress-groups{background-image:url('../images/icons64.png');background-size:419px 45px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image{background-image:url('../images/menu-2x.png') !important;background-size:209px 64px}.bp-badge{background-image:url('../images/badge-2x.png');background-size:173px 194px}}
1
+ body.branch-3-6 div#icon-buddypress,body.branch-3-7 div#icon-buddypress{background:url('../images/icons32.png') no-repeat -370px -6px}body.branch-3-6 div#icon-buddypress-activity,body.branch-3-7 div#icon-buddypress-activity{background:url('../images/icons32.png') no-repeat -10px -6px}body.branch-3-6 div#icon-buddypress-groups,body.branch-3-7 div#icon-buddypress-groups{background:url('../images/icons32.png') no-repeat -250px -6px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{background-image:url('../images/menu.png') !important;background-position:-178px -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image{background-position:-178px -2px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image{background-image:url('../images/menu.png');background-position:0 -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network.wp-has-current-submenu .wp-menu-image{background-position:0 -2px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image{background-image:url('../images/menu.png');background-position:-61px -34px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups.wp-has-current-submenu .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network:hover .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.current .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network.wp-has-current-submenu .wp-menu-image{background-position:-61px -2px}#adminmenu .toplevel_page_network-tools div.wp-menu-image:before{content:""}th.column-gid{width:60px}td.column-gid{vertical-align:middle}table.bp-group-members th,table.bp-group-members td{padding:5px 0}table.bp-group-members .uid-column{padding-left:20px;padding-right:20px}table.bp-group-members .uname-column{width:70%}table.bp-group-members .urole-column{padding-left:20px;padding-right:20px}#adminmenu #toplevel_page_bp-activity .wp-menu-image:before,#adminmenu #toplevel_page_bp-activity_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before{content:"\f452"}#adminmenu #toplevel_page_bp-groups .wp-menu-image:before,#adminmenu #toplevel_page_bp-groups_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before{content:"\f456"}#adminmenu #toplevel_page_bp-notifications .wp-menu-image:before,#adminmenu #toplevel_page_bp-notifications_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-notifications_network .wp-menu-image:before{content:"\f439"}#adminmenu #toplevel_page_bp-messages .wp-menu-image:before,#adminmenu #toplevel_page_bp-messages_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-messages_network .wp-menu-image:before{content:"\f457"}#adminmenu #toplevel_page_bp-friends .wp-menu-image:before,#adminmenu #toplevel_page_bp-friends_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-friends_network .wp-menu-image:before{content:"\f454"}#adminmenu #toplevel_page_bp-settings .wp-menu-image:before,#adminmenu #toplevel_page_bp-settings_user .wp-menu-image:before,#adminmenu #toplevel_page_bp-settings_network .wp-menu-image:before{content:"\f108"}#adminmenu li.toplevel_page_bp-components .wp-menu-image,#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{content:"\f448"}body.branch-3-6 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,body.branch-3-6 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,body.branch-3-6 #adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 #adminmenu #toplevel_page_bp-activity .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-activity_network .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-groups .wp-menu-image:before,body.branch-3-7 #adminmenu #toplevel_page_bp-groups_network .wp-menu-image:before,body.branch-3-7 #adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 #adminmenu li.toplevel_page_bp-general-settings .wp-menu-image{content:""}.settings_page_bp-components td.plugin-title span{float:left;width:18px;height:18px;margin-right:5px}.settings_page_bp-components td.plugin-title span:before{font-family:'dashicons';font-size:18px}.settings_page_bp-components tr.activity td.plugin-title span:before{content:"\f452"}.settings_page_bp-components tr.notifications td.plugin-title span:before{content:"\f339"}.settings_page_bp-components tr.xprofile td.plugin-title span:before{content:"\f336"}.settings_page_bp-components tr.settings td.plugin-title span:before{content:"\f108"}.settings_page_bp-components tr.groups td.plugin-title span:before{content:"\f456"}.settings_page_bp-components tr.messages td.plugin-title span:before{content:"\f457"}.settings_page_bp-components tr.forums td.plugin-title span:before{content:"\f452"}.settings_page_bp-components tr.blogs td.plugin-title span:before{content:"\f120"}.settings_page_bp-components tr.friends td.plugin-title span:before{content:"\f454"}body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.notifications td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span:before,body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.notifications td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span:before,body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span:before{content:""}body.branch-3-6.settings_page_bp-components td.plugin-title span,body.branch-3-7.settings_page_bp-components td.plugin-title span{background-image:url('../images/menu.png');background-position:-4px -40px;background-repeat:no-repeat}body.branch-3-6.settings_page_bp-components tr.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.active td.plugin-title span{background-position-y:-7px}body.branch-3-6.settings_page_bp-components tr.activity td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.activity td.plugin-title span{background-position:-4px -40px}body.branch-3-6.settings_page_bp-components tr.activity.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.activity.active td.plugin-title span{background-position:-4px -7px}body.branch-3-6.settings_page_bp-components tr.xprofile td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.xprofile td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-305px -40px}body.branch-3-6.settings_page_bp-components tr.xprofile.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.xprofile.active td.plugin-title span{background-position:-305px -7px}body.branch-3-6.settings_page_bp-components tr.settings td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.settings td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-334px -40px}body.branch-3-6.settings_page_bp-components tr.settings.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.settings.active td.plugin-title span{background-position:-334px -7px}body.branch-3-6.settings_page_bp-components tr.groups td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.groups td.plugin-title span{background-position:-66px -40px}body.branch-3-6.settings_page_bp-components tr.groups.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.groups.active td.plugin-title span{background-position:-66px -7px}body.branch-3-6.settings_page_bp-components tr.messages td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.messages td.plugin-title span{background-position:-154px -40px}body.branch-3-6.settings_page_bp-components tr.messages.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.messages.active td.plugin-title span{background-position:-154px -7px}body.branch-3-6.settings_page_bp-components tr.forums td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.forums td.plugin-title span{background-image:url('../images/menu-wp.png');background-position:-36px -40px}body.branch-3-6.settings_page_bp-components tr.forums.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.forums.active td.plugin-title span{background-position:-36px -7px}body.branch-3-6.settings_page_bp-components tr.blogs td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.blogs td.plugin-title span{background-position:-125px -40px}body.branch-3-6.settings_page_bp-components tr.blogs.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.blogs.active td.plugin-title span{background-position:-125px -7px}body.branch-3-6.settings_page_bp-components tr.friends td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.friends td.plugin-title span{background-position:-95px -40px}body.branch-3-6.settings_page_bp-components tr.friends.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.friends.active td.plugin-title span{background-position:-95px -7px}body.branch-3-6.settings_page_bp-components tr.core td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.core td.plugin-title span{background-position:-184px -40px}body.branch-3-6.settings_page_bp-components tr.core.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.core.active td.plugin-title span{background-position:-184px -7px}body.branch-3-6.settings_page_bp-components tr.members td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.members td.plugin-title span{background-position:-36px -40px}body.branch-3-6.settings_page_bp-components tr.members.active td.plugin-title span,body.branch-3-7.settings_page_bp-components tr.members.active td.plugin-title span{background-position:-36px -7px}#bp-admin-component-form .widefat th{display:table-cell;vertical-align:top}.bp-badge{font:normal 150px/1 'dashicons' !important;color:#000;display:inline-block}.bp-badge:before{content:"\f448"}.about-wrap .bp-badge{position:absolute;top:0;right:0}body.rtl .about-wrap .bp-badge{right:auto;left:0}@media only screen and (-webkit-min-device-pixel-ratio:1.5){body.branch-3-6 div#icon-buddypress,body.branch-3-6 div#icon-buddypress-activity,body.branch-3-6 div#icon-buddypress-groups,body.branch-3-7 div#icon-buddypress,body.branch-3-7 div#icon-buddypress-activity,body.branch-3-7 div#icon-buddypress-groups{background-image:url('../images/icons64.png');background-size:419px 45px}body.branch-3-6 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-6 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-components .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-activity_network .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups .wp-menu-image,body.branch-3-7 ul#adminmenu li.toplevel_page_bp-groups_network .wp-menu-image{background-image:url('../images/menu-2x.png') !important;background-size:209px 64px}.bp-badge{background-image:url('../images/badge-2x.png');background-size:173px 194px}}
bp-core/bp-core-admin.php CHANGED
@@ -393,7 +393,7 @@ class BP_Admin {
393
  }
394
 
395
  /** Avatar upload for users or groups ************************************/
396
-
397
  if ( ! empty( $avatar_setting ) ) {
398
  // Allow avatar uploads
399
  add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', $avatar_setting );
@@ -634,11 +634,6 @@ class BP_Admin {
634
 
635
  <h4 class="wp-people-group"><?php _e( 'Project Leaders', 'buddypress' ); ?></h4>
636
  <ul class="wp-people-group " id="wp-people-group-project-leaders">
637
- <li class="wp-person" id="wp-person-apeatling">
638
- <a href="http://profiles.wordpress.org/apeatling"><img src="http://0.gravatar.com/avatar/bb29d699b5cba218c313b61aa82249da?s=60" class="gravatar" alt="Andy Peatling" /></a>
639
- <a class="web" href="http://profiles.wordpress.org/apeatling">Andy Peatling</a>
640
- <span class="title"><?php _e( 'Founding Developer', 'buddypress' ); ?></span>
641
- </li>
642
  <li class="wp-person" id="wp-person-johnjamesjacoby">
643
  <a href="http://profiles.wordpress.org/johnjamesjacoby"><img src="http://0.gravatar.com/avatar/81ec16063d89b162d55efe72165c105f?s=60" class="gravatar" alt="John James Jacoby" /></a>
644
  <a class="web" href="http://profiles.wordpress.org/johnjamesjacoby">John James Jacoby</a>
@@ -656,75 +651,77 @@ class BP_Admin {
656
  </li>
657
  </ul>
658
 
659
- <h4 class="wp-people-group"><?php _e( 'Core Developers', 'buddypress' ); ?></h4>
660
- <ul class="wp-people-group " id="wp-people-group-core-developers">
661
  <li class="wp-person" id="wp-person-r-a-y">
662
  <a href="http://profiles.wordpress.org/r-a-y"><img src="http://0.gravatar.com/avatar/3bfa556a62b5bfac1012b6ba5f42ebfa?s=60" class="gravatar" alt="Ray" /></a>
663
  <a class="web" href="http://profiles.wordpress.org/r-a-y">Ray</a>
 
664
  </li>
665
- </ul>
666
-
667
- <h4 class="wp-people-group"><?php _e( 'Recent Rockstars', 'buddypress' ); ?></h4>
668
- <ul class="wp-people-group " id="wp-people-group-rockstars">
669
  <li class="wp-person" id="wp-person-imath">
670
  <a href="http://profiles.wordpress.org/imath"><img src="http://0.gravatar.com/avatar/8b208ca408dad63888253ee1800d6a03?s=60" class="gravatar" alt="Mathieu Viet" /></a>
671
  <a class="web" href="http://profiles.wordpress.org/imath">Mathieu Viet</a>
672
- </li>
673
- <li class="wp-person" id="wp-person-hnla">
674
- <a href="http://profiles.wordpress.org/hnla"><img src="http://0.gravatar.com/avatar/3860c955aa3f79f13b92826ae47d07fe?s=60" class="gravatar" alt="Hugo Ashmore" /></a>
675
- <a class="web" href="http://profiles.wordpress.org/hnla">Hugo Ashmore</a>
676
  </li>
677
  <li class="wp-person" id="wp-person-mercime">
678
  <a href="http://profiles.wordpress.org/mercime"><img src="http://0.gravatar.com/avatar/fae451be6708241627983570a1a1817a?s=60" class="gravatar" alt="Mercime" /></a>
679
  <a class="web" href="http://profiles.wordpress.org/mercime">Mercime</a>
 
 
 
 
 
 
 
 
 
680
  </li>
681
- <li class="wp-person" id="wp-person-karmatosed">
682
- <a href="http://profiles.wordpress.org/karmatosed"><img src="http://0.gravatar.com/avatar/d36d2c1821af9249b69ff7f5ed60529b?s=60" class="gravatar" alt="Tammie Lister" /></a>
683
- <a class="web" href="http://profiles.wordpress.org/karmatosed">Tammie Lister</a>
684
  </li>
685
  </ul>
686
 
687
- <h4 class="wp-people-group"><?php _e( 'Contributors to BuddyPress 1.9', 'buddypress' ); ?></h4>
688
  <p class="wp-credits-list">
689
- <a href="http://profiles.wordpress.org/AliMH/">AliMH</a>,
690
- <a href="http://profiles.wordpress.org/asakurayoh/">asakurayoh</a>,
691
- <a href="http://profiles.wordpress.org/boonebgorges/">boonebgorges</a>,
692
- <a href="http://profiles.wordpress.org/burakali/">burakali</a>,
693
- <a href="http://profiles.wordpress.org/dcavins/">dcavins</a>,
694
- <a href="http://profiles.wordpress.org/ddean/">ddean</a>,
695
- <a href="http://profiles.wordpress.org/DennisSmolek/">DennisSmolek</a>,
696
- <a href="http://profiles.wordpress.org/dimensionmedia/">dimensionmedia</a>,
697
- <a href="http://profiles.wordpress.org/djpaul/">DJPaul</a>,
698
- <a href="http://profiles.wordpress.org/dtc7240/">dtc7240</a>,
699
- <a href="http://profiles.wordpress.org/ericlewis/">ericlewis</a>,
700
- <a href="http://profiles.wordpress.org/gametako/">gametako</a>,
701
- <a href="http://profiles.wordpress.org/geoffroycochard/">geoffroycochard</a>,
702
- <a href="http://profiles.wordpress.org/graham-washbrook/">graham-washbrook</a>,
703
- <a href="http://profiles.wordpress.org/hanni/">hanni</a>,
704
- <a href="http://profiles.wordpress.org/haykayltduk/">haykayltduk</a>,
705
- <a href="http://profiles.wordpress.org/henrywright/">henrywright</a>,
706
- <a href="http://profiles.wordpress.org/hnla/">hnla</a>,
707
- <a href="http://profiles.wordpress.org/imath/">imath</a>,
708
- <a href="http://profiles.wordpress.org/johnjamesjacoby/">johnjamesjacoby</a>,
709
- <a href="http://profiles.wordpress.org/lenasterg/">lenasterg</a>,
710
- <a href="http://profiles.wordpress.org/mboynes/">mboynes</a>,
711
- <a href="http://profiles.wordpress.org/megainfo/">megainfo</a>,
712
- <a href="http://profiles.wordpress.org/Mike_Cowobo/">Mike_Cowobo</a>,
713
- <a href="http://profiles.wordpress.org/modemlooper/">modemlooper</a>,
714
- <a href="http://profiles.wordpress.org/olivM/">olivM</a>,
715
- <a href="http://profiles.wordpress.org/needle/">needle</a>,
716
- <a href="http://profiles.wordpress.org/netweblogic/">netweblogic</a>,
717
- <a href="http://profiles.wordpress.org/r-a-y/">r-a-y</a>,
718
- <a href="http://profiles.wordpress.org/ryderlewis/">ryderlewis</a>,
719
- <a href="http://profiles.wordpress.org/sbrajesh/">sbrajesh</a>,
720
- <a href="http://profiles.wordpress.org/sgr33n/">sgr33n</a>,
721
- <a href="http://profiles.wordpress.org/sooskriszta/">sooskriszta</a>,
722
- <a href="http://profiles.wordpress.org/terraling/">terraling</a>,
723
- <a href="http://profiles.wordpress.org/tomdxw/">tomdxw</a>,
724
- <a href="http://profiles.wordpress.org/trishasalas/">trishasalas</a>,
725
- <a href="http://profiles.wordpress.org/vhauri/">vhauri</a>,
726
- <a href="http://profiles.wordpress.org/williamsba1/">williamsba1</a>,
727
- <a href="http://profiles.wordpress.org/wpdennis/">wpdennis</a>
728
  </p>
729
 
730
  <?php if ( current_user_can( $this->capability ) ) :?>
393
  }
394
 
395
  /** Avatar upload for users or groups ************************************/
396
+
397
  if ( ! empty( $avatar_setting ) ) {
398
  // Allow avatar uploads
399
  add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads', 'buddypress' ), 'bp_admin_setting_callback_avatar_uploads', 'buddypress', $avatar_setting );
634
 
635
  <h4 class="wp-people-group"><?php _e( 'Project Leaders', 'buddypress' ); ?></h4>
636
  <ul class="wp-people-group " id="wp-people-group-project-leaders">
 
 
 
 
 
637
  <li class="wp-person" id="wp-person-johnjamesjacoby">
638
  <a href="http://profiles.wordpress.org/johnjamesjacoby"><img src="http://0.gravatar.com/avatar/81ec16063d89b162d55efe72165c105f?s=60" class="gravatar" alt="John James Jacoby" /></a>
639
  <a class="web" href="http://profiles.wordpress.org/johnjamesjacoby">John James Jacoby</a>
651
  </li>
652
  </ul>
653
 
654
+ <h4 class="wp-people-group"><?php _e( 'Core Team', 'buddypress' ); ?></h4>
655
+ <ul class="wp-people-group " id="wp-people-group-core-team">
656
  <li class="wp-person" id="wp-person-r-a-y">
657
  <a href="http://profiles.wordpress.org/r-a-y"><img src="http://0.gravatar.com/avatar/3bfa556a62b5bfac1012b6ba5f42ebfa?s=60" class="gravatar" alt="Ray" /></a>
658
  <a class="web" href="http://profiles.wordpress.org/r-a-y">Ray</a>
659
+ <span class="title"><?php _e( 'Core Developer', 'buddypress' ); ?></span>
660
  </li>
 
 
 
 
661
  <li class="wp-person" id="wp-person-imath">
662
  <a href="http://profiles.wordpress.org/imath"><img src="http://0.gravatar.com/avatar/8b208ca408dad63888253ee1800d6a03?s=60" class="gravatar" alt="Mathieu Viet" /></a>
663
  <a class="web" href="http://profiles.wordpress.org/imath">Mathieu Viet</a>
664
+ <span class="title"><?php _e( 'Core Developer', 'buddypress' ); ?></span>
 
 
 
665
  </li>
666
  <li class="wp-person" id="wp-person-mercime">
667
  <a href="http://profiles.wordpress.org/mercime"><img src="http://0.gravatar.com/avatar/fae451be6708241627983570a1a1817a?s=60" class="gravatar" alt="Mercime" /></a>
668
  <a class="web" href="http://profiles.wordpress.org/mercime">Mercime</a>
669
+ <span class="title"><?php _e( 'Navigator', 'buddypress' ); ?></span>
670
+ </li>
671
+ </ul>
672
+
673
+ <h4 class="wp-people-group"><?php _e( 'Recent Rockstars', 'buddypress' ); ?></h4>
674
+ <ul class="wp-people-group " id="wp-people-group-rockstars">
675
+ <li class="wp-person" id="wp-person-dcavins">
676
+ <a href="http://profiles.wordpress.org/dcavins"><img src="http://0.gravatar.com/avatar/a5fa7e83d59cb45ebb616235a176595a?s=60" class="gravatar" alt="David Cavins" /></a>
677
+ <a class="web" href="http://profiles.wordpress.org/dcavins">David Cavins</a>
678
  </li>
679
+ <li class="wp-person" id="wp-person-henry-wright">
680
+ <a href="http://profiles.wordpress.org/henry.wright"><img src="http://0.gravatar.com/avatar/0da2f1a9340d6af196b870f6c107a248?s=60" class="gravatar" alt="Henry Wright" /></a>
681
+ <a class="web" href="http://profiles.wordpress.org/henry.wright">Henry Wright</a>
682
  </li>
683
  </ul>
684
 
685
+ <h4 class="wp-people-group"><?php _e( 'Contributors to BuddyPress 2.0', 'buddypress' ); ?></h4>
686
  <p class="wp-credits-list">
687
+ <a href="https://profiles.wordpress.org/boonebgorges/">boonebgorges</a>,
688
+ <a href="https://profiles.wordpress.org/Bowromir/">Bowromir</a>,
689
+ <a href="https://profiles.wordpress.org/burakali/">burakali</a>,
690
+ <a href="https://profiles.wordpress.org/chouf1/">chouf1</a>,
691
+ <a href="https://profiles.wordpress.org/cmmarslender/">cmmarslender</a>,
692
+ <a href="https://profiles.wordpress.org/danbp/">danbp</a>,
693
+ <a href="https://profiles.wordpress.org/dcavins/">dcavins</a>,
694
+ <a href="https://profiles.wordpress.org/Denis-de-Bernardy/">Denis-de-Bernardy</a>,
695
+ <a href="https://profiles.wordpress.org/DJPaul/">DJPaul</a>,
696
+ <a href="https://profiles.wordpress.org/ericlewis/">ericlewis</a>,
697
+ <a href="https://profiles.wordpress.org/glyndavidson/">glyndavidson</a>,
698
+ <a href="https://profiles.wordpress.org/graham-washbrook/">graham-washbrook</a>,
699
+ <a href="https://profiles.wordpress.org/henrywright/">henrywright</a>,
700
+ <a href="https://profiles.wordpress.org/henry.wright/">henry.wright</a>,
701
+ <a href="https://profiles.wordpress.org/hnla/">hnla</a>,
702
+ <a href="https://profiles.wordpress.org/imath/">imath</a>,
703
+ <a href="https://profiles.wordpress.org/johnjamesjacoby/">johnjamesjacoby</a>,
704
+ <a href="https://profiles.wordpress.org/lenasterg/">lenasterg</a>,
705
+ <a href="https://profiles.wordpress.org/MacPresss/">MacPresss</a>,
706
+ <a href="https://profiles.wordpress.org/markoheijnen/">markoheijnen</a>,
707
+ <a href="https://profiles.wordpress.org/megainfo/">megainfo</a>,
708
+ <a href="https://profiles.wordpress.org/modemlooper/">modemlooper</a>,
709
+ <a href="https://profiles.wordpress.org/mpa4hu/">mpa4hu</a>,
710
+ <a href="https://profiles.wordpress.org/needle/">needle</a>,
711
+ <a href="https://profiles.wordpress.org/netweb/">netweb</a>,
712
+ <a href="https://profiles.wordpress.org/ninnypants/">ninnypants</a>,
713
+ Pietro Oliva,
714
+ <a href="https://profiles.wordpress.org/r-a-y/">r-a-y</a>,
715
+ <a href="https://profiles.wordpress.org/reactuate/">reactuate</a>,
716
+ <a href="https://profiles.wordpress.org/rodrigorznd/">rodrigorznd</a>,
717
+ <a href="https://profiles.wordpress.org/rogercoathup/">rogercoathup</a>,
718
+ <a href="https://profiles.wordpress.org/SergeyBiryukov/">SergeyBiryukov</a>,
719
+ <a href="https://profiles.wordpress.org/shanebp/">shanebp</a>,
720
+ <a href="https://profiles.wordpress.org/SlothLoveChunk/">SlothLoveChunk</a>,
721
+ <a href="https://profiles.wordpress.org/StijnDeWitt/">StijnDeWitt</a>,
722
+ <a href="https://profiles.wordpress.org/terraling/">terraling</a>,
723
+ <a href="https://profiles.wordpress.org/tw2113/">tw2113</a>,
724
+ <a href="https://profiles.wordpress.org/vanillalounge/">vanillalounge</a>.
 
725
  </p>
726
 
727
  <?php if ( current_user_can( $this->capability ) ) :?>
bp-core/bp-core-avatars.php CHANGED
@@ -1033,7 +1033,7 @@ function bp_get_user_has_avatar( $user_id = 0 ) {
1033
  $user_id = bp_displayed_user_id();
1034
 
1035
  $retval = false;
1036
- if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default() )
1037
  $retval = true;
1038
 
1039
  return (bool) apply_filters( 'bp_get_user_has_avatar', $retval, $user_id );
1033
  $user_id = bp_displayed_user_id();
1034
 
1035
  $retval = false;
1036
+ if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default( 'local' ) )
1037
  $retval = true;
1038
 
1039
  return (bool) apply_filters( 'bp_get_user_has_avatar', $retval, $user_id );
bp-core/bp-core-loader.php CHANGED
@@ -215,7 +215,7 @@ class BP_Core extends BP_Component {
215
  * @param array $sub_nav Optional. See BP_Component::setup_nav() for
216
  * description.
217
  */
218
- public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
219
  $bp = buddypress();
220
 
221
  // If xprofile component is disabled, revert to WordPress profile
215
  * @param array $sub_nav Optional. See BP_Component::setup_nav() for
216
  * description.
217
  */
218
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
219
  $bp = buddypress();
220
 
221
  // If xprofile component is disabled, revert to WordPress profile
bp-core/css/buddybar.min.css CHANGED
@@ -1 +1 @@
1
- body:not(.wp-admin){padding-top:25px!important}#wp-admin-bar{position:fixed;top:0;left:0;height:25px;font-size:11px;width:100%;z-index:9999}#wp-admin-bar .padder{position:relative;padding:0;width:100%;margin:0 auto;background:url('../images/60pc_black.png');height:25px}body#bp-default #wp-admin-bar .padder{max-width:1250px}#wp-admin-bar *{z-index:999}#wp-admin-bar div#admin-bar-logo{position:absolute;top:5px;left:10px}#wp-admin-bar a img{border:0}#wp-admin-bar li{list-style:none;margin:0;padding:0;line-height:100%;text-align:left}#wp-admin-bar li a{padding:7px 15px 7px 15px;color:#eee;text-decoration:none;font-size:11px}#wp-admin-bar li.alt{border:0}#wp-admin-bar li.no-arrow a{padding-right:15px}#wp-admin-bar ul li ul li a span{display:none}#wp-admin-bar li:hover,#wp-admin-bar li.hover{position:static}#admin-bar-logo{float:left;font-weight:bold;font-size:11px;padding:5px 8px;margin:0;text-decoration:none;color:#fff}body#bp-default #admin-bar-logo{padding:2px 8px}#wp-admin-bar ul{margin:0;list-style:none;line-height:1;cursor:pointer;height:auto;padding:0}#wp-admin-bar ul li{padding:0;float:left;position:relative;background:url('../images/admin-menu-arrow.gif') 88% 53% no-repeat;padding-right:11px}#wp-admin-bar ul li.no-arrow{background:0;padding-right:0}#wp-admin-bar ul li ul li{background-image:none}#wp-admin-bar ul li.align-right{position:absolute;right:0}#wp-admin-bar ul li a{display:block}#wp-admin-bar ul.main-nav li:hover,#wp-admin-bar ul.main-nav li.sfhover,#wp-admin-bar ul.main-nav li ul li.sfhover{background-color:#333}#wp-admin-bar ul li ul{position:absolute;width:185px;left:-999em;margin-left:0;background:#333;border:1px solid #222;-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);-moz-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;-moz-border-radius-topright:0;-webkit-border-top-right-radius:0}#wp-admin-bar ul li>ul{border-top:0}#wp-admin-bar ul li ul a{color:#eee}#wp-admin-bar ul li ul li{float:left;width:174px;margin:0}#wp-admin-bar ul li ul li:hover a{color:#fff}#wp-admin-bar ul li div.admin-bar-clear{clear:both}#wp-admin-bar ul.main-nav li ul li:hover,#wp-admin-bar ul.main-nav li ul li.sfhover,#wp-admin-bar ul.main-nav li ul li.sfhover{background-color:#222}#wp-admin-bar ul li ul ul{margin:-25px 0 0 184px;-moz-border-radius:3px;-webkit-border-radius:3px}#wp-admin-bar ul li ul li:hover ul li a{color:#eee}#wp-admin-bar ul li ul li ul li:hover a{color:#fff}#wp-admin-bar ul li:hover ul,#wp-admin-bar ul li ul li:hover ul,#wp-admin-bar ul li.sfhover ul,#wp-admin-bar ul li ul li.sfhover ul{left:auto}#wp-admin-bar ul li.align-right:hover ul{right:0}#wp-admin-bar ul li:hover ul ul,#wp-admin-bar li.sfhover ul li ul{left:-999em}#wp-admin-bar img.avatar{float:left;margin-right:8px}#wp-admin-bar span.activity{display:block;margin-left:34px;padding:0}#wp-admin-bar ul.author-list li a{height:17px}#wp-admin-bar ul li#bp-adminbar-notifications-menu a span{padding:0 6px;margin-left:2px;background:#fff;color:#000;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#wp-admin-bar-user-info img.avatar{height:64px;width:64px}
1
+ body:not(.wp-admin){padding-top:25px !important}#wp-admin-bar{position:fixed;top:0;left:0;height:25px;font-size:11px;width:100%;z-index:9999}#wp-admin-bar .padder{position:relative;padding:0;width:100%;margin:0 auto;background:url('../images/60pc_black.png');height:25px}body#bp-default #wp-admin-bar .padder{max-width:1250px}#wp-admin-bar *{z-index:999}#wp-admin-bar div#admin-bar-logo{position:absolute;top:5px;left:10px}#wp-admin-bar a img{border:0}#wp-admin-bar li{list-style:none;margin:0;padding:0;line-height:100%;text-align:left}#wp-admin-bar li a{padding:7px 15px 7px 15px;color:#eee;text-decoration:none;font-size:11px}#wp-admin-bar li.alt{border:0}#wp-admin-bar li.no-arrow a{padding-right:15px}#wp-admin-bar ul li ul li a span{display:none}#wp-admin-bar li:hover,#wp-admin-bar li.hover{position:static}#admin-bar-logo{float:left;font-weight:bold;font-size:11px;padding:5px 8px;margin:0;text-decoration:none;color:#fff}body#bp-default #admin-bar-logo{padding:2px 8px}#wp-admin-bar ul{margin:0;list-style:none;line-height:1;cursor:pointer;height:auto;padding:0}#wp-admin-bar ul li{padding:0;float:left;position:relative;background:url('../images/admin-menu-arrow.gif') 88% 53% no-repeat;padding-right:11px}#wp-admin-bar ul li.no-arrow{background:0;padding-right:0}#wp-admin-bar ul li ul li{background-image:none}#wp-admin-bar ul li.align-right{position:absolute;right:0}#wp-admin-bar ul li a{display:block}#wp-admin-bar ul.main-nav li:hover,#wp-admin-bar ul.main-nav li.sfhover,#wp-admin-bar ul.main-nav li ul li.sfhover{background-color:#333}#wp-admin-bar ul li ul{position:absolute;width:185px;left:-999em;margin-left:0;background:#333;border:1px solid #222;-moz-box-shadow:0 4px 8px rgba(0,0,0,0.1);-webkit-box-shadow:0 4px 8px rgba(0,0,0,0.1);-moz-border-radius:3px;-webkit-border-radius:3px;-moz-border-radius-topleft:0;-webkit-border-top-left-radius:0;-moz-border-radius-topright:0;-webkit-border-top-right-radius:0}#wp-admin-bar ul li>ul{border-top:0}#wp-admin-bar ul li ul a{color:#eee}#wp-admin-bar ul li ul li{float:left;width:174px;margin:0}#wp-admin-bar ul li ul li:hover a{color:#fff}#wp-admin-bar ul li div.admin-bar-clear{clear:both}#wp-admin-bar ul.main-nav li ul li:hover,#wp-admin-bar ul.main-nav li ul li.sfhover,#wp-admin-bar ul.main-nav li ul li.sfhover{background-color:#222}#wp-admin-bar ul li ul ul{margin:-25px 0 0 184px;-moz-border-radius:3px;-webkit-border-radius:3px}#wp-admin-bar ul li ul li:hover ul li a{color:#eee}#wp-admin-bar ul li ul li ul li:hover a{color:#fff}#wp-admin-bar ul li:hover ul,#wp-admin-bar ul li ul li:hover ul,#wp-admin-bar ul li.sfhover ul,#wp-admin-bar ul li ul li.sfhover ul{left:auto}#wp-admin-bar ul li.align-right:hover ul{right:0}#wp-admin-bar ul li:hover ul ul,#wp-admin-bar li.sfhover ul li ul{left:-999em}#wp-admin-bar img.avatar{float:left;margin-right:8px}#wp-admin-bar span.activity{display:block;margin-left:34px;padding:0}#wp-admin-bar ul.author-list li a{height:17px}#wp-admin-bar ul li#bp-adminbar-notifications-menu a span{padding:0 6px;margin-left:2px;background:#fff;color:#000;-moz-border-radius:3px;-webkit-border-radius:3px;border-radius:3px}#wp-admin-bar-user-info img.avatar{height:64px;width:64px}
bp-core/js/confirm.min.js CHANGED
@@ -1,7 +1 @@
1
- jQuery( document ).ready( function() {
2
- jQuery( 'a.confirm').click( function() {
3
- if ( confirm( BP_Confirm.are_you_sure ) )
4
- return true; else return false;
5
- });
6
- });
7
-
1
+ jQuery(document).ready(function(){jQuery("a.confirm").click(function(){if(confirm(BP_Confirm.are_you_sure)){return true}else{return false}})});
 
 
 
 
 
 
bp-forums/bp-forums-loader.php CHANGED
@@ -231,7 +231,7 @@ class BP_Forums_Component extends BP_Component {
231
  /**
232
  * Set up the title for pages and the <title> element.
233
  */
234
- function setup_title() {
235
  $bp = buddypress();
236
 
237
  // Adjust title based on view
231
  /**
232
  * Set up the title for pages and the <title> element.
233
  */
234
+ public function setup_title() {
235
  $bp = buddypress();
236
 
237
  // Adjust title based on view
bp-friends/bp-friends-loader.php CHANGED
@@ -220,7 +220,7 @@ class BP_Friends_Component extends BP_Component {
220
  /**
221
  * Set up the title for pages and <title>.
222
  */
223
- function setup_title() {
224
  $bp = buddypress();
225
 
226
  // Adjust title
220
  /**
221
  * Set up the title for pages and <title>.
222
  */
223
+ public function setup_title() {
224
  $bp = buddypress();
225
 
226
  // Adjust title
bp-groups/bp-groups-activity.php CHANGED
@@ -143,11 +143,13 @@ function bp_groups_prefetch_activity_object_data( $activities ) {
143
  }
144
  }
145
 
146
- global $wpdb, $bp;
147
- $uncached_ids_sql = implode( ',', wp_parse_id_list( $uncached_ids ) );
148
- $groups = $wpdb->get_results( "SELECT * FROM {$bp->groups->table_name} WHERE id IN ({$uncached_ids_sql})" );
149
- foreach ( $groups as $group ) {
150
- wp_cache_set( $group->id, $group, 'bp_groups' );
 
 
151
  }
152
  }
153
  }
143
  }
144
  }
145
 
146
+ if ( ! empty( $uncached_ids ) ) {
147
+ global $wpdb, $bp;
148
+ $uncached_ids_sql = implode( ',', wp_parse_id_list( $uncached_ids ) );
149
+ $groups = $wpdb->get_results( "SELECT * FROM {$bp->groups->table_name} WHERE id IN ({$uncached_ids_sql})" );
150
+ foreach ( $groups as $group ) {
151
+ wp_cache_set( $group->id, $group, 'bp_groups' );
152
+ }
153
  }
154
  }
155
  }
bp-groups/bp-groups-admin.php CHANGED
@@ -1265,9 +1265,9 @@ class BP_Groups_List_Table extends WP_List_Table {
1265
 
1266
  <ul class="subsubsub">
1267
  <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
1268
- <li class="public"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'public', $url_base ) ) ); ?>" class="<?php if ( 'public' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Public <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->group_counts['public'] ) ); ?></a> |</li>
1269
- <li class="private"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'private', $url_base ) ) ); ?>" class="<?php if ( 'private' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Private <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->group_counts['private'] ) ); ?></a> |</li>
1270
- <li class="hidden"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'hidden', $url_base ) ) ); ?>" class="<?php if ( 'hidden' == $this->view ) echo 'current'; ?>"><?php printf( __( 'Hidden <span class="count">(%s)</span>', 'buddypress' ), number_format_i18n( $this->group_counts['hidden'] ) ); ?></a></li>
1271
 
1272
  <?php do_action( 'bp_groups_list_table_get_views', $url_base, $this->view ); ?>
1273
  </ul>
1265
 
1266
  <ul class="subsubsub">
1267
  <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li>
1268
+ <li class="public"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'public', $url_base ) ) ); ?>" class="<?php if ( 'public' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Public <span class="count">(%s)</span>', 'Public <span class="count">(%s)</span>', $this->group_counts['public'], 'buddypress' ), number_format_i18n( $this->group_counts['public'] ) ); ?></a> |</li>
1269
+ <li class="private"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'private', $url_base ) ) ); ?>" class="<?php if ( 'private' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>', $this->group_counts['private'], 'buddypress' ), number_format_i18n( $this->group_counts['private'] ) ); ?></a> |</li>
1270
+ <li class="hidden"><a href="<?php echo esc_attr( esc_url( add_query_arg( 'group_status', 'hidden', $url_base ) ) ); ?>" class="<?php if ( 'hidden' == $this->view ) echo 'current'; ?>"><?php printf( _n( 'Hidden <span class="count">(%s)</span>', 'Hidden <span class="count">(%s)</span>', $this->group_counts['hidden'], 'buddypress' ), number_format_i18n( $this->group_counts['hidden'] ) ); ?></a></li>
1271
 
1272
  <?php do_action( 'bp_groups_list_table_get_views', $url_base, $this->view ); ?>
1273
  </ul>
bp-groups/bp-groups-loader.php CHANGED
@@ -586,7 +586,7 @@ class BP_Groups_Component extends BP_Component {
586
  /**
587
  * Sets up the title for pages and <title>
588
  */
589
- function setup_title() {
590
  $bp = buddypress();
591
 
592
  if ( bp_is_groups_component() ) {
586
  /**
587
  * Sets up the title for pages and <title>
588
  */
589
+ public function setup_title() {
590
  $bp = buddypress();
591
 
592
  if ( bp_is_groups_component() ) {
bp-groups/bp-groups-template.php CHANGED
@@ -2900,11 +2900,28 @@ function bp_group_current_avatar( $type = 'thumb' ) {
2900
  return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
2901
  }
2902
 
2903
- function bp_get_group_has_avatar() {
2904
  global $bp;
2905
 
2906
- if ( !empty( $_FILES ) || !bp_core_fetch_avatar( array( 'item_id' => $bp->groups->current_group->id, 'object' => 'group', 'no_grav' => true ) ) )
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2907
  return false;
 
2908
 
2909
  return true;
2910
  }
2900
  return apply_filters( 'bp_get_group_current_avatar', $group_avatar );
2901
  }
2902
 
2903
+ function bp_get_group_has_avatar( $group_id = false ) {
2904
  global $bp;
2905
 
2906
+ if ( false === $group_id ) {
2907
+ $group_id = bp_get_current_group_id();
2908
+ }
2909
+
2910
+ // Todo - this looks like an overgeneral check
2911
+ if ( ! empty( $_FILES ) ) {
2912
+ return false;
2913
+ }
2914
+
2915
+ $group_avatar = bp_core_fetch_avatar( array(
2916
+ 'item_id' => $group_id,
2917
+ 'object' => 'group',
2918
+ 'no_grav' => true,
2919
+ 'html' => false,
2920
+ ) );
2921
+
2922
+ if ( bp_core_avatar_default( 'local' ) === $group_avatar ) {
2923
  return false;
2924
+ }
2925
 
2926
  return true;
2927
  }
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: 2014-03-18 17:30:35+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -25,7 +25,7 @@ msgid "The activity item has been marked as spam and is no longer visible."
25
  msgstr ""
26
 
27
  #: bp-activity/bp-activity-actions.php:269
28
- #: bp-templates/bp-legacy/buddypress-functions.php:681
29
  #: bp-themes/bp-default/_inc/ajax.php:276
30
  msgid "Please enter some content to post."
31
  msgstr ""
@@ -39,7 +39,7 @@ msgid "There was an error when posting your update, please try again."
39
  msgstr ""
40
 
41
  #: bp-activity/bp-activity-actions.php:329
42
- #: bp-templates/bp-legacy/buddypress-functions.php:742
43
  #: bp-themes/bp-default/_inc/ajax.php:324
44
  msgid "Please do not leave the comment area blank."
45
  msgstr ""
@@ -49,8 +49,8 @@ msgid "Reply Posted!"
49
  msgstr ""
50
 
51
  #: bp-activity/bp-activity-actions.php:342
52
- #: bp-templates/bp-legacy/buddypress-functions.php:745
53
- #: bp-templates/bp-legacy/buddypress-functions.php:754
54
  #: bp-themes/bp-default/_inc/ajax.php:327
55
  #: bp-themes/bp-default/_inc/ajax.php:336
56
  msgid "There was an error posting that reply, please try again."
@@ -141,11 +141,11 @@ msgid "Activity feed of %s's favorites."
141
  msgstr ""
142
 
143
  #: bp-activity/bp-activity-admin.php:32 bp-activity/bp-activity-admin.php:33
144
- #: bp-activity/bp-activity-admin.php:886 bp-activity/bp-activity-admin.php:1219
145
  #: bp-activity/bp-activity-loader.php:139
146
  #: bp-activity/bp-activity-loader.php:268
147
  #: bp-activity/bp-activity-screens.php:270
148
- #: bp-activity/bp-activity-screens.php:437 bp-core/bp-core-admin.php:526
149
  msgid "Activity"
150
  msgstr ""
151
 
@@ -162,8 +162,8 @@ msgstr ""
162
  #: bp-core/admin/bp-core-functions.php:469
163
  #: bp-core/admin/bp-core-functions.php:488
164
  #: bp-core/admin/bp-core-functions.php:507 bp-groups/bp-groups-admin.php:111
165
- #: bp-groups/bp-groups-admin.php:146 bp-members/bp-members-admin.php:355
166
- #: bp-members/bp-members-admin.php:873
167
  msgid "Overview"
168
  msgstr ""
169
 
@@ -204,8 +204,8 @@ msgstr ""
204
  #: bp-core/admin/bp-core-functions.php:475
205
  #: bp-core/admin/bp-core-functions.php:494
206
  #: bp-core/admin/bp-core-functions.php:513 bp-groups/bp-groups-admin.php:119
207
- #: bp-groups/bp-groups-admin.php:162 bp-members/bp-members-admin.php:364
208
- #: bp-members/bp-members-admin.php:894
209
  msgid "For more information:"
210
  msgstr ""
211
 
@@ -218,7 +218,7 @@ msgstr ""
218
  #: bp-core/admin/bp-core-functions.php:477
219
  #: bp-core/admin/bp-core-functions.php:496
220
  #: bp-core/admin/bp-core-functions.php:515 bp-groups/bp-groups-admin.php:163
221
- #: bp-members/bp-members-admin.php:366 bp-members/bp-members-admin.php:895
222
  msgid "<a href=\"http://buddypress.org/support/\">Support Forums</a>"
223
  msgstr ""
224
 
@@ -272,31 +272,31 @@ msgstr ""
272
  msgid "In the <strong>In Response To</strong> column, if the activity was in reply to another activity, it shows that activity's author's picture and name, and a link to that activity on your live site. If there is a small bubble, the number in it shows how many other activities are related to this one; these are usually comments. Clicking the bubble will filter the activity screen to show only related activity items."
273
  msgstr ""
274
 
275
- #: bp-activity/bp-activity-admin.php:598
276
  msgid "Editing Activity (ID #%s)"
277
  msgstr ""
278
 
279
- #: bp-activity/bp-activity-admin.php:609
280
  msgid "Action"
281
  msgstr ""
282
 
283
- #: bp-activity/bp-activity-admin.php:616
284
  msgid "Content"
285
  msgstr ""
286
 
287
- #: bp-activity/bp-activity-admin.php:641
288
  msgid "No activity found with this ID. <a href=\"%s\">Go back and try again</a>."
289
  msgstr ""
290
 
291
- #: bp-activity/bp-activity-admin.php:664
292
  msgid "View Activity"
293
  msgstr ""
294
 
295
- #: bp-activity/bp-activity-admin.php:672
296
  msgid "Approved"
297
  msgstr ""
298
 
299
- #: bp-activity/bp-activity-admin.php:673 bp-activity/bp-activity-admin.php:1351
300
  #: bp-activity/bp-activity-akismet.php:197
301
  #: bp-activity/bp-activity-akismet.php:226
302
  msgid "Spam"
@@ -304,119 +304,119 @@ msgstr ""
304
 
305
  #. translators: Publish box date format, see http:php.net/date
306
 
307
- #: bp-activity/bp-activity-admin.php:679 bp-members/bp-members-admin.php:620
308
- #: bp-members/bp-members-admin.php:679
309
  msgid "M j, Y @ G:i"
310
  msgstr ""
311
 
312
- #: bp-activity/bp-activity-admin.php:682
313
  msgid "Submitted on: <strong>%1$s</strong>"
314
  msgstr ""
315
 
316
- #: bp-activity/bp-activity-admin.php:682 bp-activity/bp-activity-admin.php:1344
317
  #: bp-forums/bp-forums-template.php:2112 bp-groups/bp-groups-admin.php:1396
318
- #: bp-themes/bp-default/functions.php:509 bp-xprofile/bp-xprofile-admin.php:456
319
- #: bp-xprofile/bp-xprofile-loader.php:201
320
- #: bp-xprofile/bp-xprofile-loader.php:279
321
  msgid "Edit"
322
  msgstr ""
323
 
324
- #: bp-activity/bp-activity-admin.php:695
325
  msgid "Update"
326
  msgstr ""
327
 
328
- #: bp-activity/bp-activity-admin.php:715
329
  msgid "Link"
330
  msgstr ""
331
 
332
- #: bp-activity/bp-activity-admin.php:717
333
  msgid "Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item."
334
  msgstr ""
335
 
336
- #: bp-activity/bp-activity-admin.php:732
337
  msgid "Author ID"
338
  msgstr ""
339
 
340
- #: bp-activity/bp-activity-admin.php:771
341
  msgid "This activity item has a type (%s) that is not registered using bp_activity_set_action(), so no label is available."
342
  msgstr ""
343
 
344
- #: bp-activity/bp-activity-admin.php:796
345
  msgid "Primary Item ID"
346
  msgstr ""
347
 
348
- #: bp-activity/bp-activity-admin.php:800
349
  msgid "Secondary Item ID"
350
  msgstr ""
351
 
352
- #: bp-activity/bp-activity-admin.php:803
353
  msgid "These identify the object that created this activity. For example, the fields could reference a pair of site and comment IDs."
354
  msgstr ""
355
 
356
- #: bp-activity/bp-activity-admin.php:843
357
  msgid "%s activity item has been permanently deleted."
358
  msgid_plural "%s activity items have been permanently deleted."
359
  msgstr[0] ""
360
  msgstr[1] ""
361
 
362
- #: bp-activity/bp-activity-admin.php:847
363
  msgid "An error occurred when trying to update activity ID #%s."
364
  msgstr ""
365
 
366
- #: bp-activity/bp-activity-admin.php:850
367
  msgid "Errors occurred when trying to update these activity items:"
368
  msgstr ""
369
 
370
  #. Translators: This is a bulleted list of item IDs
371
 
372
- #: bp-activity/bp-activity-admin.php:856
373
  msgid "#%s"
374
  msgstr ""
375
 
376
- #: bp-activity/bp-activity-admin.php:865
377
  msgid "%s activity item has been successfully spammed."
378
  msgid_plural "%s activity items have been successfully spammed."
379
  msgstr[0] ""
380
  msgstr[1] ""
381
 
382
- #: bp-activity/bp-activity-admin.php:868
383
  msgid "%s activity item has been successfully unspammed."
384
  msgid_plural "%s activity items have been successfully unspammed."
385
  msgstr[0] ""
386
  msgstr[1] ""
387
 
388
- #: bp-activity/bp-activity-admin.php:871
389
  msgid "The activity item has been updated succesfully."
390
  msgstr ""
391
 
392
- #: bp-activity/bp-activity-admin.php:884
393
  msgid "Activity related to ID #%s"
394
  msgstr ""
395
 
396
- #: bp-activity/bp-activity-admin.php:890 bp-groups/bp-groups-admin.php:645
397
- #: bp-members/bp-members-admin.php:1252
398
  msgid "Search results for &#8220;%s&#8221;"
399
  msgstr ""
400
 
401
- #: bp-activity/bp-activity-admin.php:903
402
  msgid "Search all Activity"
403
  msgstr ""
404
 
405
- #: bp-activity/bp-activity-admin.php:914
406
  msgid "Reply to Activity"
407
  msgstr ""
408
 
409
- #: bp-activity/bp-activity-admin.php:918 bp-groups/bp-groups-admin.php:599
410
- #: bp-members/bp-members-admin.php:1377
411
  #: bp-templates/bp-legacy/buddypress/activity/entry.php:102
412
  #: bp-templates/bp-legacy/buddypress/forums/index.php:116
413
  #: bp-themes/bp-default/forums/index.php:134
414
  #: bp-xprofile/bp-xprofile-classes.php:506
415
- #: bp-xprofile/bp-xprofile-classes.php:976
416
  msgid "Cancel"
417
  msgstr ""
418
 
419
- #: bp-activity/bp-activity-admin.php:919 bp-activity/bp-activity-admin.php:1341
420
  #: bp-templates/bp-legacy/buddypress/activity/comment.php:37
421
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:10
422
  #: bp-themes/bp-default/activity/comment.php:40
@@ -424,70 +424,84 @@ msgstr ""
424
  msgid "Reply"
425
  msgstr ""
426
 
427
- #: bp-activity/bp-activity-admin.php:1109
428
  msgid "No activities found."
429
  msgstr ""
430
 
431
- #: bp-activity/bp-activity-admin.php:1182 bp-groups/bp-groups-admin.php:1267
432
- #: bp-messages/bp-messages-template.php:531
433
  msgid "All"
434
  msgstr ""
435
 
436
- #: bp-activity/bp-activity-admin.php:1183
437
  msgid "Spam <span class=\"count\">(%s)</span>"
438
  msgstr ""
439
 
440
- #: bp-activity/bp-activity-admin.php:1199
 
441
  msgid "Mark as Spam"
442
  msgstr ""
443
 
444
- #: bp-activity/bp-activity-admin.php:1200
445
- #: bp-activity/bp-activity-admin.php:1349
 
446
  msgid "Not Spam"
447
  msgstr ""
448
 
449
- #: bp-activity/bp-activity-admin.php:1201
450
- #: bp-activity/bp-activity-admin.php:1354 bp-groups/bp-groups-admin.php:598
451
  msgid "Delete Permanently"
452
  msgstr ""
453
 
454
- #: bp-activity/bp-activity-admin.php:1218
455
  msgid "Author"
456
  msgstr ""
457
 
458
- #: bp-activity/bp-activity-admin.php:1220
459
  msgid "In Response To"
460
  msgstr ""
461
 
462
- #: bp-activity/bp-activity-admin.php:1263
463
  msgid "Show all activity types"
464
  msgstr ""
465
 
466
- #: bp-activity/bp-activity-admin.php:1270
467
  msgid "Filter"
468
  msgstr ""
469
 
470
- #: bp-activity/bp-activity-admin.php:1286
471
  msgid "Select activity item %1$d"
472
  msgstr ""
473
 
474
- #: bp-activity/bp-activity-admin.php:1354 bp-core/bp-core-cssjs.php:24
 
 
 
 
 
 
 
 
 
 
 
 
475
  msgid "Are you sure?"
476
  msgstr ""
477
 
478
  #. translators: 2: activity admin ui date/time
479
 
480
- #: bp-activity/bp-activity-admin.php:1363
481
  msgid "Submitted on <a href=\"%1$s\">%2$s at %3$s</a>"
482
  msgstr ""
483
 
484
- #: bp-activity/bp-activity-admin.php:1395
485
  msgid "%s related activity"
486
  msgid_plural "%s related activities"
487
  msgstr[0] ""
488
  msgstr[1] ""
489
 
490
- #: bp-activity/bp-activity-admin.php:1406
491
  msgid "<a href=\"%1$s\">View Activity</a>"
492
  msgstr ""
493
 
@@ -541,56 +555,56 @@ msgid "<span>%1$s</span> &mdash; %2$s"
541
  msgstr ""
542
 
543
  #: bp-activity/bp-activity-classes.php:280
544
- #: bp-activity/bp-activity-template.php:139 bp-groups/bp-groups-classes.php:626
545
- #: bp-groups/bp-groups-functions.php:389 bp-groups/bp-groups-template.php:112
546
- #: bp-groups/bp-groups-template.php:1996 bp-groups/bp-groups-template.php:2947
547
- #: bp-groups/bp-groups-template.php:3169
548
  msgid "Arguments passed to %1$s should be in an associative array. See the inline documentation at %2$s for more details."
549
  msgstr ""
550
 
551
- #: bp-activity/bp-activity-classes.php:1372
552
  msgid "RSS feed 'id' must be defined"
553
  msgstr ""
554
 
555
- #: bp-activity/bp-activity-classes.php:1485
556
  msgid "In reply to"
557
  msgstr ""
558
 
559
- #: bp-activity/bp-activity-filters.php:381
560
  msgid "[Read more]"
561
  msgstr ""
562
 
563
- #: bp-activity/bp-activity-filters.php:386
564
  msgid "&hellip;"
565
  msgstr ""
566
 
567
- #: bp-activity/bp-activity-filters.php:541
568
  msgid "Load Newest"
569
  msgstr ""
570
 
571
- #: bp-activity/bp-activity-functions.php:822
572
  msgid "Posted a status update"
573
  msgstr ""
574
 
575
- #: bp-activity/bp-activity-functions.php:829
576
  msgid "Replied to a status update"
577
  msgstr ""
578
 
579
- #: bp-activity/bp-activity-functions.php:880
580
  msgid "%s posted an update"
581
  msgstr ""
582
 
583
- #: bp-activity/bp-activity-functions.php:894
584
  #: tests/testcases/activity/class.BP_Activity_Activity.php:216
585
  msgid "%s posted a new activity comment"
586
  msgstr ""
587
 
588
- #: bp-activity/bp-activity-functions.php:1656
589
  msgid "Thumbnail"
590
  msgstr ""
591
 
592
  #: bp-activity/bp-activity-loader.php:30
593
- #: bp-core/admin/bp-core-components.php:379
594
  msgid "Activity Streams"
595
  msgstr ""
596
 
@@ -630,13 +644,12 @@ msgstr ""
630
  #: bp-activity/bp-activity-loader.php:313 bp-core/bp-core-template.php:389
631
  #: bp-groups/bp-groups-admin.php:32 bp-groups/bp-groups-admin.php:33
632
  #: bp-groups/bp-groups-admin.php:638 bp-groups/bp-groups-loader.php:365
633
- #: bp-groups/bp-groups-loader.php:541 bp-groups/bp-groups-notifications.php:377
634
  #: bp-groups/bp-groups-notifications.php:413
635
  #: bp-groups/bp-groups-notifications.php:449
636
  #: bp-groups/bp-groups-notifications.php:485
637
- #: bp-groups/bp-groups-screens.php:936 bp-groups/bp-groups-screens.php:1124
638
- #: bp-groups/bp-groups-screens.php:1126 bp-groups/bp-groups-widgets.php:53
639
- #: bp-groups/bp-groups-widgets.php:124
640
  msgid "Groups"
641
  msgstr ""
642
 
@@ -649,29 +662,29 @@ msgid "My Activity"
649
  msgstr ""
650
 
651
  #: bp-activity/bp-activity-loader.php:342
652
- #: bp-activity/bp-activity-template.php:1207
653
- #: bp-activity/bp-activity-template.php:1357
654
- #: bp-activity/bp-activity-template.php:1368 bp-blogs/bp-blogs-loader.php:236
655
  #: bp-forums/bp-forums-loader.php:245 bp-forums/bp-forums-template.php:730
656
  #: bp-forums/bp-forums-template.php:960 bp-forums/bp-forums-template.php:1990
657
- #: bp-friends/bp-friends-loader.php:234 bp-groups/bp-groups-loader.php:602
658
- #: bp-groups/bp-groups-template.php:786 bp-groups/bp-groups-template.php:809
659
- #: bp-groups/bp-groups-template.php:1238 bp-groups/bp-groups-template.php:1254
660
- #: bp-groups/bp-groups-template.php:1303 bp-groups/bp-groups-template.php:1319
661
- #: bp-groups/bp-groups-template.php:2194 bp-groups/bp-groups-template.php:2203
662
- #: bp-groups/bp-groups-template.php:2212 bp-groups/bp-groups-template.php:3106
663
  #: bp-members/bp-members-buddybar.php:64 bp-members/bp-members-loader.php:224
664
  #: bp-members/bp-members-template.php:520
665
  #: bp-members/bp-members-template.php:881
666
  #: bp-members/bp-members-template.php:900
667
  #: bp-messages/bp-messages-loader.php:265
668
- #: bp-messages/bp-messages-template.php:410
669
  #: bp-notifications/bp-notifications-loader.php:236
670
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:185
671
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:212
672
  #: bp-themes/bp-default/groups/single/admin.php:185
673
  #: bp-themes/bp-default/groups/single/admin.php:212
674
- #: bp-xprofile/bp-xprofile-loader.php:325
675
  msgid "Profile picture of %s"
676
  msgstr ""
677
 
@@ -764,7 +777,7 @@ msgstr ""
764
  #: bp-activity/bp-activity-screens.php:271 bp-blogs/bp-blogs-template.php:997
765
  #: bp-friends/bp-friends-screens.php:86 bp-groups/bp-groups-screens.php:937
766
  #: bp-messages/bp-messages-screens.php:169
767
- #: bp-templates/bp-legacy/buddypress/members/register.php:227
768
  #: bp-themes/bp-default/registration/register.php:232
769
  msgid "Yes"
770
  msgstr ""
@@ -772,7 +785,7 @@ msgstr ""
772
  #: bp-activity/bp-activity-screens.php:272 bp-blogs/bp-blogs-template.php:1001
773
  #: bp-friends/bp-friends-screens.php:87 bp-groups/bp-groups-screens.php:938
774
  #: bp-messages/bp-messages-screens.php:170
775
- #: bp-templates/bp-legacy/buddypress/members/register.php:228
776
  #: bp-themes/bp-default/registration/register.php:233
777
  msgid "No"
778
  msgstr ""
@@ -795,40 +808,40 @@ msgctxt "Activity pagination next text"
795
  msgid "&rarr;"
796
  msgstr ""
797
 
798
- #: bp-activity/bp-activity-template.php:736
799
  msgid "Viewing item %1$s to %2$s (of %3$s item)"
800
  msgid_plural "Viewing item %1$s to %2$s (of %3$s items)"
801
  msgstr[0] ""
802
  msgstr[1] ""
803
 
804
- #: bp-activity/bp-activity-template.php:1207
805
  msgid "Profile picture"
806
  msgstr ""
807
 
808
- #: bp-activity/bp-activity-template.php:1333
809
  msgid "Group logo"
810
  msgstr ""
811
 
812
- #: bp-activity/bp-activity-template.php:1336 bp-groups/bp-groups-admin.php:1410
813
  #: bp-groups/bp-groups-template.php:518
814
  msgid "Group logo of %s"
815
  msgstr ""
816
 
817
- #: bp-activity/bp-activity-template.php:1347
818
  msgid "Profile picture of the author of the site %s"
819
  msgstr ""
820
 
821
- #: bp-activity/bp-activity-template.php:1577
822
  msgid "View Discussion"
823
  msgstr ""
824
 
825
- #: bp-activity/bp-activity-template.php:2461
826
  #: bp-forums/bp-forums-template.php:2113 bp-groups/bp-groups-admin.php:1286
827
- #: bp-groups/bp-groups-admin.php:1399 bp-groups/bp-groups-template.php:1502
828
  #: bp-members/admin/bp-members-classes.php:148
829
- #: bp-members/admin/bp-members-classes.php:265
830
- #: bp-members/admin/bp-members-classes.php:451
831
- #: bp-members/admin/bp-members-classes.php:566
832
  #: bp-notifications/bp-notifications-template.php:826
833
  #: bp-templates/bp-legacy/buddypress/activity/comment.php:43
834
  #: bp-templates/bp-legacy/buddypress/members/single/messages/messages-loop.php:51
@@ -836,39 +849,39 @@ msgstr ""
836
  #: bp-themes/bp-default/activity/comment.php:46
837
  #: bp-themes/bp-default/members/single/messages/messages-loop.php:51
838
  #: bp-themes/bp-default/members/single/messages/single.php:24
839
- #: bp-xprofile/bp-xprofile-admin.php:460
840
  msgid "Delete"
841
  msgstr ""
842
 
843
- #: bp-activity/bp-activity-template.php:2509
844
  #: bp-core/admin/bp-core-slugs.php:109 bp-core/admin/bp-core-slugs.php:172
845
- #: bp-core/bp-core-loader.php:242 bp-members/bp-members-loader.php:198
846
  #: bp-members/bp-members-template.php:649
847
- #: bp-templates/bp-legacy/buddypress-functions.php:247
848
  #: bp-themes/bp-default/activity/entry.php:37
849
  #: bp-themes/bp-default/functions.php:166
850
- #: bp-xprofile/bp-xprofile-loader.php:191
851
- #: bp-xprofile/bp-xprofile-loader.php:271
852
  msgid "View"
853
  msgstr ""
854
 
855
- #: bp-activity/bp-activity-template.php:2607
856
  msgid "Clear Filter"
857
  msgstr ""
858
 
859
- #: bp-activity/bp-activity-template.php:2803
860
  msgid "a user"
861
  msgstr ""
862
 
863
- #: bp-activity/bp-activity-template.php:2857
864
  msgid "Send a public message on your activity stream."
865
  msgstr ""
866
 
867
- #: bp-activity/bp-activity-template.php:2858
868
  msgid "Public Message"
869
  msgstr ""
870
 
871
- #: bp-activity/bp-activity-template.php:3311
872
  msgid "Site Wide Activity RSS Feed"
873
  msgstr ""
874
 
@@ -888,19 +901,19 @@ msgstr ""
888
  msgid "%s created the site %s"
889
  msgstr ""
890
 
891
- #: bp-blogs/bp-blogs-activity.php:128 bp-blogs/bp-blogs-functions.php:338
892
  msgid "%1$s wrote a new post, %2$s, on the site %3$s"
893
  msgstr ""
894
 
895
- #: bp-blogs/bp-blogs-activity.php:130 bp-blogs/bp-blogs-functions.php:340
896
  msgid "%1$s wrote a new post, %2$s"
897
  msgstr ""
898
 
899
- #: bp-blogs/bp-blogs-activity.php:195 bp-blogs/bp-blogs-functions.php:446
900
  msgid "%1$s commented on the post, %2$s, on the site %3$s"
901
  msgstr ""
902
 
903
- #: bp-blogs/bp-blogs-activity.php:197 bp-blogs/bp-blogs-functions.php:448
904
  msgid "%1$s commented on the post, %2$s"
905
  msgstr ""
906
 
@@ -929,7 +942,7 @@ msgstr ""
929
  msgid "Create a Site!"
930
  msgstr ""
931
 
932
- #: bp-blogs/bp-blogs-loader.php:25 bp-core/admin/bp-core-components.php:395
933
  msgid "Site Tracking"
934
  msgstr ""
935
 
@@ -975,7 +988,7 @@ msgid "Profile picture of site author %s"
975
  msgstr ""
976
 
977
  #: bp-blogs/bp-blogs-template.php:648 bp-core/bp-core-classes.php:816
978
- #: bp-groups/bp-groups-template.php:3277 bp-groups/bp-groups-widgets.php:85
979
  #: bp-groups/bp-groups-widgets.php:197 bp-members/bp-members-template.php:616
980
  #: bp-members/bp-members-template.php:932
981
  #: bp-templates/bp-legacy/buddypress/groups/groups-loop.php:47
@@ -1040,7 +1053,7 @@ msgid "Privacy:"
1040
  msgstr ""
1041
 
1042
  #: bp-blogs/bp-blogs-template.php:993
1043
- #: bp-templates/bp-legacy/buddypress/members/register.php:224
1044
  #: bp-themes/bp-default/registration/register.php:229
1045
  msgid "I would like my site to appear in search engines, and in public listings around this network."
1046
  msgstr ""
@@ -1066,9 +1079,9 @@ msgid "%s's Recent Comments"
1066
  msgstr ""
1067
 
1068
  #: bp-blogs/bp-blogs-template.php:1149 bp-core/deprecated/1.5.php:417
1069
- #: bp-forums/bp-forums-template.php:2196 bp-groups/bp-groups-template.php:2744
1070
  #: bp-members/bp-members-template.php:771
1071
- #: bp-messages/bp-messages-template.php:464 bp-themes/bp-default/header.php:30
1072
  #: bp-themes/bp-default/searchform.php:5
1073
  msgid "Search"
1074
  msgstr ""
@@ -1120,34 +1133,34 @@ msgstr ""
1120
 
1121
  #: bp-core/admin/bp-core-components.php:32
1122
  #: bp-core/admin/bp-core-settings.php:281 bp-core/admin/bp-core-slugs.php:32
1123
- #: bp-templates/bp-legacy/buddypress/members/single/settings/profile.php:38
1124
- #: bp-themes/bp-default/members/single/settings/profile.php:88
1125
  msgid "Save Settings"
1126
  msgstr ""
1127
 
1128
  #: bp-core/admin/bp-core-components.php:59
1129
- #: bp-core/admin/bp-core-components.php:363
1130
  #: bp-xprofile/bp-xprofile-loader.php:41
1131
  msgid "Extended Profiles"
1132
  msgstr ""
1133
 
1134
  #: bp-core/admin/bp-core-components.php:60
1135
- #: bp-core/admin/bp-core-components.php:364
1136
  msgid "Customize your community with fully editable profile fields that allow your users to describe themselves."
1137
  msgstr ""
1138
 
1139
  #: bp-core/admin/bp-core-components.php:63
1140
- #: bp-core/admin/bp-core-components.php:367
1141
  msgid "Account Settings"
1142
  msgstr ""
1143
 
1144
  #: bp-core/admin/bp-core-components.php:64
1145
- #: bp-core/admin/bp-core-components.php:368
1146
  msgid "Allow your users to modify their account and notification settings directly from within their profiles."
1147
  msgstr ""
1148
 
1149
  #: bp-core/admin/bp-core-components.php:67
1150
- #: bp-core/admin/bp-core-components.php:383
1151
  #: bp-notifications/bp-notifications-buddybar.php:28
1152
  #: bp-notifications/bp-notifications-loader.php:26
1153
  #: bp-notifications/bp-notifications-loader.php:113
@@ -1157,7 +1170,7 @@ msgid "Notifications"
1157
  msgstr ""
1158
 
1159
  #: bp-core/admin/bp-core-components.php:68
1160
- #: bp-core/admin/bp-core-components.php:384
1161
  msgid "Notify members of relevant activity with a toolbar bubble and/or via email, and allow them to customize their notification settings."
1162
  msgstr ""
1163
 
@@ -1203,8 +1216,8 @@ msgid "Description"
1203
  msgstr ""
1204
 
1205
  #: bp-core/admin/bp-core-components.php:189
1206
- #: bp-members/admin/bp-members-classes.php:211
1207
- #: bp-members/admin/bp-members-classes.php:514
1208
  msgid "Select %s"
1209
  msgstr ""
1210
 
@@ -1212,73 +1225,73 @@ msgstr ""
1212
  msgid "No components found."
1213
  msgstr ""
1214
 
1215
- #: bp-core/admin/bp-core-components.php:343 bp-core/bp-core-loader.php:27
1216
  msgid "BuddyPress Core"
1217
  msgstr ""
1218
 
1219
- #: bp-core/admin/bp-core-components.php:344
1220
  msgid "It&#8216;s what makes <del>time travel</del> BuddyPress possible!"
1221
  msgstr ""
1222
 
1223
- #: bp-core/admin/bp-core-components.php:347
1224
  msgid "Community Members"
1225
  msgstr ""
1226
 
1227
- #: bp-core/admin/bp-core-components.php:348
1228
  msgid "Everything in a BuddyPress community revolves around its members."
1229
  msgstr ""
1230
 
1231
- #: bp-core/admin/bp-core-components.php:355
1232
  #: bp-templates/bp-legacy/buddypress/groups/create.php:105
1233
  #: bp-themes/bp-default/groups/create.php:112
1234
  msgid "Group Forums"
1235
  msgstr ""
1236
 
1237
- #: bp-core/admin/bp-core-components.php:356
1238
  msgid "BuddyPress Forums are retired. Use %s."
1239
  msgstr ""
1240
 
1241
- #: bp-core/admin/bp-core-components.php:371 bp-friends/bp-friends-loader.php:24
1242
  msgid "Friend Connections"
1243
  msgstr ""
1244
 
1245
- #: bp-core/admin/bp-core-components.php:372
1246
  msgid "Let your users make connections so they can track the activity of others and focus on the people they care about the most."
1247
  msgstr ""
1248
 
1249
- #: bp-core/admin/bp-core-components.php:375
1250
  msgid "Private Messaging"
1251
  msgstr ""
1252
 
1253
- #: bp-core/admin/bp-core-components.php:376
1254
  msgid "Allow your users to talk to each other directly and in private. Not just limited to one-on-one discussions, messages can be sent between any number of members."
1255
  msgstr ""
1256
 
1257
- #: bp-core/admin/bp-core-components.php:380
1258
  msgid "Global, personal, and group activity streams with threaded commenting, direct posting, favoriting, and @mentions, all with full RSS feed and email notification support."
1259
  msgstr ""
1260
 
1261
- #: bp-core/admin/bp-core-components.php:387 bp-groups/bp-groups-loader.php:83
1262
  msgid "User Groups"
1263
  msgstr ""
1264
 
1265
- #: bp-core/admin/bp-core-components.php:388
1266
  msgid "Groups allow your users to organize themselves into specific public, private or hidden sections with separate activity streams and member listings."
1267
  msgstr ""
1268
 
1269
- #: bp-core/admin/bp-core-components.php:391
1270
  msgid "Group Forums (Legacy)"
1271
  msgstr ""
1272
 
1273
- #: bp-core/admin/bp-core-components.php:392
1274
  msgid "Group forums allow for focused, bulletin-board style conversations."
1275
  msgstr ""
1276
 
1277
- #: bp-core/admin/bp-core-components.php:396
1278
  msgid "Record activity for new posts and comments from your site."
1279
  msgstr ""
1280
 
1281
- #: bp-core/admin/bp-core-components.php:403
1282
  msgid "Record activity for new sites, posts, and comments across your network."
1283
  msgstr ""
1284
 
@@ -1299,11 +1312,11 @@ msgid "<strong>BuddyPress is almost ready</strong>. You must <a href=\"%s\">upda
1299
  msgstr ""
1300
 
1301
  #: bp-core/admin/bp-core-functions.php:272 bp-core/admin/bp-core-slugs.php:135
1302
- #: bp-members/admin/bp-members-classes.php:256
1303
- #: bp-members/admin/bp-members-classes.php:260
1304
- #: bp-members/admin/bp-members-classes.php:559
1305
- #: bp-members/admin/bp-members-classes.php:561
1306
- #: bp-messages/bp-messages-template.php:655
1307
  #: bp-templates/bp-legacy/buddypress/members/activate.php:29
1308
  #: bp-themes/bp-default/registration/activate.php:38
1309
  msgid "Activate"
@@ -1327,8 +1340,8 @@ msgid "Pages"
1327
  msgstr ""
1328
 
1329
  #: bp-core/admin/bp-core-functions.php:397
1330
- #: bp-core/admin/bp-core-settings.php:272 bp-core/bp-core-admin.php:432
1331
- #: bp-groups/bp-groups-loader.php:320 bp-groups/bp-groups-template.php:1484
1332
  #: bp-settings/bp-settings-loader.php:23 bp-settings/bp-settings-loader.php:73
1333
  #: bp-settings/bp-settings-loader.php:163
1334
  msgid "Settings"
@@ -1374,9 +1387,9 @@ msgstr ""
1374
  msgid "Your users will distinguish themselves through their profile page. Create relevant profile fields that will show on each users profile.</br></br>Note: Any fields in the first group will appear on the signup page."
1375
  msgstr ""
1376
 
1377
- #: bp-core/admin/bp-core-functions.php:704 bp-core/bp-core-admin.php:208
1378
- #: bp-core/bp-core-admin.php:209 bp-core/bp-core-admin.php:229
1379
- #: bp-core/bp-core-admin.php:283
1380
  msgid "BuddyPress"
1381
  msgstr ""
1382
 
@@ -1402,12 +1415,21 @@ msgstr ""
1402
  msgid "Add to Menu"
1403
  msgstr ""
1404
 
1405
- #: bp-core/admin/bp-core-schema.php:256
 
 
 
 
 
 
 
 
 
1406
  msgctxt "First field-group name"
1407
  msgid "General"
1408
  msgstr ""
1409
 
1410
- #: bp-core/admin/bp-core-schema.php:260
1411
  msgctxt "Display name field"
1412
  msgid "Display Name"
1413
  msgstr ""
@@ -1488,7 +1510,7 @@ msgstr ""
1488
  #: bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php:13
1489
  #: bp-themes/bp-default/members/single/settings/capabilities.php:61
1490
  #: bp-xprofile/bp-xprofile-classes.php:501
1491
- #: bp-xprofile/bp-xprofile-classes.php:973
1492
  msgid "Save"
1493
  msgstr ""
1494
 
@@ -1501,7 +1523,7 @@ msgid "Associate WordPress Pages with the following BuddyPress Registration page
1501
  msgstr ""
1502
 
1503
  #: bp-core/admin/bp-core-tools.php:19 bp-core/admin/bp-core-tools.php:342
1504
- #: bp-core/admin/bp-core-tools.php:345 bp-core/bp-core-admin.php:282
1505
  msgid "BuddyPress Tools"
1506
  msgstr ""
1507
 
@@ -1566,8 +1588,8 @@ msgstr ""
1566
  msgid "Determining last activity dates for each user&hellip; %s"
1567
  msgstr ""
1568
 
1569
- #: bp-core/admin/bp-core-tools.php:320 bp-core/bp-core-admin.php:259
1570
- #: bp-core/bp-core-admin.php:260
1571
  msgid "Tools"
1572
  msgstr ""
1573
 
@@ -1576,258 +1598,262 @@ msgctxt "buddypress tools intro"
1576
  msgid "Use the %s to repair these relationships."
1577
  msgstr ""
1578
 
1579
- #: bp-core/bp-core-admin.php:188 bp-core/bp-core-admin.php:189
1580
- #: bp-core/bp-core-admin.php:197 bp-core/bp-core-admin.php:198
1581
  msgid "Welcome to BuddyPress"
1582
  msgstr ""
1583
 
1584
- #: bp-core/bp-core-admin.php:218
1585
  msgid "BuddyPress Help"
1586
  msgstr ""
1587
 
1588
- #: bp-core/bp-core-admin.php:219
1589
  msgid "Help"
1590
  msgstr ""
1591
 
1592
- #: bp-core/bp-core-admin.php:228
1593
  msgid "BuddyPress Components"
1594
  msgstr ""
1595
 
1596
- #: bp-core/bp-core-admin.php:237 bp-core/bp-core-admin.php:238
1597
  msgid "BuddyPress Pages"
1598
  msgstr ""
1599
 
1600
- #: bp-core/bp-core-admin.php:246 bp-core/bp-core-admin.php:247
1601
  msgid "BuddyPress Settings"
1602
  msgstr ""
1603
 
1604
- #: bp-core/bp-core-admin.php:270 bp-core/bp-core-admin.php:271
1605
  msgid "Available Tools"
1606
  msgstr ""
1607
 
1608
- #: bp-core/bp-core-admin.php:309
1609
  msgid "Main Settings"
1610
  msgstr ""
1611
 
1612
- #: bp-core/bp-core-admin.php:312 bp-core/bp-core-admin.php:317
1613
  msgid "Toolbar"
1614
  msgstr ""
1615
 
1616
- #: bp-core/bp-core-admin.php:322
1617
  msgid "Account Deletion"
1618
  msgstr ""
1619
 
1620
- #: bp-core/bp-core-admin.php:330
1621
  #: bp-themes/bp-default/members/single/settings/profile.php:49
1622
  msgid "Profile Settings"
1623
  msgstr ""
1624
 
1625
- #: bp-core/bp-core-admin.php:335
1626
  msgid "Profile Syncing"
1627
  msgstr ""
1628
 
1629
- #: bp-core/bp-core-admin.php:344
1630
  msgid "Groups Settings"
1631
  msgstr ""
1632
 
1633
- #: bp-core/bp-core-admin.php:350
1634
  msgid "Group Creation"
1635
  msgstr ""
1636
 
1637
- #: bp-core/bp-core-admin.php:359
1638
  msgid "Legacy Group Forums"
1639
  msgstr ""
1640
 
1641
- #: bp-core/bp-core-admin.php:362
1642
  msgid "bbPress Configuration"
1643
  msgstr ""
1644
 
1645
- #: bp-core/bp-core-admin.php:371
1646
  msgid "Activity Settings"
1647
  msgstr ""
1648
 
1649
- #: bp-core/bp-core-admin.php:374
1650
  msgid "Blog &amp; Forum Comments"
1651
  msgstr ""
1652
 
1653
- #: bp-core/bp-core-admin.php:378
1654
  msgid "Activity auto-refresh"
1655
  msgstr ""
1656
 
1657
- #: bp-core/bp-core-admin.php:383
1658
  msgid "Akismet"
1659
  msgstr ""
1660
 
1661
- #: bp-core/bp-core-admin.php:392
1662
  msgid "Avatar Uploads"
1663
  msgstr ""
1664
 
1665
- #: bp-core/bp-core-admin.php:409
1666
  msgid "About BuddyPress"
1667
  msgstr ""
1668
 
1669
- #: bp-core/bp-core-admin.php:433
1670
  msgid "About"
1671
  msgstr ""
1672
 
1673
- #: bp-core/bp-core-admin.php:487 bp-core/bp-core-admin.php:614
1674
  msgid "Welcome to BuddyPress %s"
1675
  msgstr ""
1676
 
1677
- #: bp-core/bp-core-admin.php:490
1678
  msgid "It&#8217;s a great time to use BuddyPress! %s is our first version with a new component in over two years. Not only that, there are plenty of new features, enhancements, and bug fixes."
1679
  msgstr ""
1680
 
1681
- #: bp-core/bp-core-admin.php:492
1682
  msgid "Thanks for updating! BuddyPress %s is our first version with a new component in over two years. Not only that, there are plenty of new features, enhancements, and bug fixes."
1683
  msgstr ""
1684
 
1685
- #: bp-core/bp-core-admin.php:497
1686
  msgid "Check out the highlights:"
1687
  msgstr ""
1688
 
1689
- #: bp-core/bp-core-admin.php:500
1690
  msgid "You can now add dynamic BuddyPress links to custom navigation menus."
1691
  msgstr ""
1692
 
1693
- #: bp-core/bp-core-admin.php:501
1694
  msgid "Notifications have been moved into their own component."
1695
  msgstr ""
1696
 
1697
- #: bp-core/bp-core-admin.php:502
1698
  msgid "Three new widgets, allowing easier site customization."
1699
  msgstr ""
1700
 
1701
- #: bp-core/bp-core-admin.php:510 bp-core/bp-core-admin.php:620
1702
  msgid "What&#8217;s New"
1703
  msgstr ""
1704
 
1705
- #: bp-core/bp-core-admin.php:512 bp-core/bp-core-admin.php:622
1706
  msgid "Credits"
1707
  msgstr ""
1708
 
1709
- #: bp-core/bp-core-admin.php:517
1710
  msgid "Getting Started"
1711
  msgstr ""
1712
 
1713
- #: bp-core/bp-core-admin.php:520
1714
  msgid "Your Default Setup"
1715
  msgstr ""
1716
 
1717
- #: bp-core/bp-core-admin.php:524
1718
  msgid "BuddyPress&#8217;s powerful features help your users connect and collaborate. To help get your community started, we&#8217;ve activated two of the most commonly used tools in BP: <strong>Extended Profiles</strong> and <strong>Activity Streams</strong>. See these components in action at the %1$s and %2$s directories, and be sure to spend a few minutes <a href=\"%3$s\">configuring user profiles</a>. Want to explore more of BP&#8217;s features? Visit the <a href=\"%4$s\">Components panel</a>."
1719
  msgstr ""
1720
 
1721
- #: bp-core/bp-core-admin.php:525 bp-core/bp-core-template.php:386
1722
- #: bp-core/bp-core-widgets.php:275 bp-groups/bp-groups-admin.php:781
1723
- #: bp-groups/bp-groups-template.php:1492 bp-members/bp-members-loader.php:24
1724
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:231
1725
  #: bp-themes/bp-default/groups/single/admin.php:231
1726
  msgid "Members"
1727
  msgstr ""
1728
 
1729
- #: bp-core/bp-core-admin.php:533
1730
  msgid "BuddyPress&#8217;s powerful features help your users connect and collaborate. Want to explore BP&#8217;s features? Visit the <a href=\"%s\">Components panel</a>."
1731
  msgstr ""
1732
 
1733
- #: bp-core/bp-core-admin.php:539
1734
  msgid "Community and Support"
1735
  msgstr ""
1736
 
1737
- #: bp-core/bp-core-admin.php:540
1738
  msgid "Looking for help? The <a href=\"http://codex.buddypress.org/\">BuddyPress Codex</a> has you covered, with dozens of user-contributed guides on how to configure and use your BP site. Can&#8217;t find what you need? Stop by <a href=\"http://buddypress.org/support/\">our support forums</a>, where a vibrant community of BuddyPress users and developers is waiting to share tips, show off their sites, talk about the future of BuddyPress, and much more."
1739
  msgstr ""
1740
 
1741
- #: bp-core/bp-core-admin.php:547
1742
  msgid "Dynamic links for custom navigation menus"
1743
  msgstr ""
1744
 
1745
- #: bp-core/bp-core-admin.php:550
1746
  msgid "It&#8217;s now easy to add BuddyPress-specific links to your menus through <a href=\"%s\">Appearance &gt; Menus</a>. For example, you can now add a link to a specific user profile screen, and each person will end up at that screen inside their own user profile."
1747
  msgstr ""
1748
 
1749
- #: bp-core/bp-core-admin.php:556
1750
  msgid "Notifications component"
1751
  msgstr ""
1752
 
1753
- #: bp-core/bp-core-admin.php:559
1754
  msgid "The notification features have been promoted into a new component. Use it to keep your site&#8217;s members abreast of the latest connections and @mentions within the site, via email notifications and Toolbar alerts."
1755
  msgstr ""
1756
 
1757
- #: bp-core/bp-core-admin.php:566
1758
  msgid "Widgets"
1759
  msgstr ""
1760
 
1761
- #: bp-core/bp-core-admin.php:570
1762
  msgid "<strong>Friends Widget</strong>: a list of recently active, popular, and newest friends of the displayed member."
1763
  msgstr ""
1764
 
1765
- #: bp-core/bp-core-admin.php:571
1766
  msgid "<strong>Log In Widget</strong>: adds a simple &ldquo;Log In&rdquo; form to your site."
1767
  msgstr ""
1768
 
1769
- #: bp-core/bp-core-admin.php:572
1770
  msgid "<strong>Sitewide Notices Widget</strong>: display Sitewide Notices from the Private Messaging component."
1771
  msgstr ""
1772
 
1773
- #: bp-core/bp-core-admin.php:579
1774
  msgid "Developer changes"
1775
  msgstr ""
1776
 
1777
- #: bp-core/bp-core-admin.php:583
1778
  msgid "<code>bp_redirect_canonical()</code> functionality has been reinstated"
1779
  msgstr ""
1780
 
1781
- #: bp-core/bp-core-admin.php:584
1782
  msgid "Improved phpDoc inline documentation"
1783
  msgstr ""
1784
 
1785
- #: bp-core/bp-core-admin.php:585
1786
  msgid "Improved compatibility with <a href=\"%s\">develop.svn.wordpress.org</a> unit-test suite"
1787
  msgstr ""
1788
 
1789
- #: bp-core/bp-core-admin.php:586
1790
  msgid "<a href=\"%s\">&hellip;and lots more!</a>"
1791
  msgstr ""
1792
 
1793
- #: bp-core/bp-core-admin.php:592 bp-core/bp-core-admin.php:725
1794
  msgid "Go to the BuddyPress Settings page"
1795
  msgstr ""
1796
 
1797
- #: bp-core/bp-core-admin.php:615
1798
  msgid "BuddyPress %s is our first version with a new component in over two years. Not only that, there are plenty of new features, enhancements, and bug fixes."
1799
  msgstr ""
1800
 
1801
- #: bp-core/bp-core-admin.php:626
1802
  msgid "BuddyPress is created by a worldwide network of friendly folks."
1803
  msgstr ""
1804
 
1805
- #: bp-core/bp-core-admin.php:628
1806
  msgid "Project Leaders"
1807
  msgstr ""
1808
 
1809
- #: bp-core/bp-core-admin.php:633
1810
- msgid "Founding Developer"
1811
- msgstr ""
1812
-
1813
- #: bp-core/bp-core-admin.php:638
1814
  msgid "Project Lead"
1815
  msgstr ""
1816
 
1817
- #: bp-core/bp-core-admin.php:643 bp-core/bp-core-admin.php:648
1818
  msgid "Lead Developer"
1819
  msgstr ""
1820
 
1821
- #: bp-core/bp-core-admin.php:652
1822
- msgid "Core Developers"
 
 
 
 
 
 
 
 
1823
  msgstr ""
1824
 
1825
- #: bp-core/bp-core-admin.php:660
1826
  msgid "Recent Rockstars"
1827
  msgstr ""
1828
 
1829
- #: bp-core/bp-core-admin.php:680
1830
- msgid "Contributors to BuddyPress 1.9"
1831
  msgstr ""
1832
 
1833
  #: bp-core/bp-core-adminbar.php:36 bp-core/bp-core-buddybar.php:571
@@ -1881,8 +1907,8 @@ msgstr ""
1881
  #: bp-core/bp-core-avatars.php:843 bp-core/bp-core-classes.php:813
1882
  #: bp-core/bp-core-classes.php:814 bp-core/bp-core-classes.php:815
1883
  #: bp-core/bp-core-template.php:160 bp-core/bp-core-template.php:176
1884
- #: bp-groups/bp-groups-template.php:3271 bp-groups/bp-groups-template.php:3272
1885
- #: bp-groups/bp-groups-template.php:3273
1886
  msgid "Avatar of %s"
1887
  msgstr ""
1888
 
@@ -1890,7 +1916,7 @@ msgstr ""
1890
  msgid "You do not have access to this page."
1891
  msgstr ""
1892
 
1893
- #: bp-core/bp-core-buddybar.php:552 bp-core/bp-core-functions.php:1784
1894
  #: bp-core/bp-core-widgets.php:90 bp-themes/bp-default/sidebar.php:52
1895
  msgid "Log In"
1896
  msgstr ""
@@ -1899,7 +1925,7 @@ msgstr ""
1899
  msgid "Sign Up"
1900
  msgstr ""
1901
 
1902
- #: bp-core/bp-core-buddybar.php:613 bp-core/bp-core-functions.php:1717
1903
  #: bp-core/bp-core-widgets.php:72 bp-core/deprecated/1.5.php:307
1904
  #: bp-members/bp-members-template.php:835 bp-themes/bp-default/sidebar.php:18
1905
  msgid "Log Out"
@@ -1934,7 +1960,7 @@ msgstr ""
1934
  msgid "You must log in to access the page you requested."
1935
  msgstr ""
1936
 
1937
- #: bp-core/bp-core-classes.php:830 bp-groups/bp-groups-template.php:3281
1938
  msgid "%d group"
1939
  msgid_plural "%d groups"
1940
  msgstr[0] ""
@@ -1965,7 +1991,7 @@ msgstr ""
1965
  msgid "Activate %s"
1966
  msgstr ""
1967
 
1968
- #: bp-core/bp-core-filters.php:359 bp-members/bp-members-functions.php:1696
1969
  msgid ""
1970
  "Thanks for registering! To complete the activation of your account please click the following link:\n"
1971
  "\n"
@@ -1973,7 +1999,7 @@ msgid ""
1973
  "\n"
1974
  msgstr ""
1975
 
1976
- #: bp-core/bp-core-filters.php:360 bp-members/bp-members-functions.php:1697
1977
  msgid "Activate Your Account"
1978
  msgstr ""
1979
 
@@ -2010,9 +2036,8 @@ msgstr ""
2010
  msgid "Activate your Account"
2011
  msgstr ""
2012
 
2013
- #: bp-core/bp-core-filters.php:462 bp-groups/bp-groups-loader.php:578
2014
- #: bp-groups/bp-groups-screens.php:1124 bp-groups/bp-groups-template.php:1883
2015
- #: bp-groups/bp-groups-template.php:1884
2016
  #: bp-themes/bp-default/groups/create.php:18
2017
  #: bp-themes/bp-default/groups/index.php:21
2018
  msgid "Create a Group"
@@ -2048,74 +2073,74 @@ msgctxt "Page title for the user registration screen."
2048
  msgid "Register"
2049
  msgstr ""
2050
 
2051
- #: bp-core/bp-core-functions.php:756
2052
  msgid "sometime"
2053
  msgstr ""
2054
 
2055
- #: bp-core/bp-core-functions.php:757
2056
  msgid "right now"
2057
  msgstr ""
2058
 
2059
- #: bp-core/bp-core-functions.php:758
2060
  msgid "%s ago"
2061
  msgstr ""
2062
 
2063
- #: bp-core/bp-core-functions.php:819
2064
  msgid "%s year"
2065
  msgid_plural "%s years"
2066
  msgstr[0] ""
2067
  msgstr[1] ""
2068
 
2069
- #: bp-core/bp-core-functions.php:822 bp-core/bp-core-functions.php:856
2070
  msgid "%s month"
2071
  msgid_plural "%s months"
2072
  msgstr[0] ""
2073
  msgstr[1] ""
2074
 
2075
- #: bp-core/bp-core-functions.php:825 bp-core/bp-core-functions.php:859
2076
  msgid "%s week"
2077
  msgid_plural "%s weeks"
2078
  msgstr[0] ""
2079
  msgstr[1] ""
2080
 
2081
- #: bp-core/bp-core-functions.php:828 bp-core/bp-core-functions.php:862
2082
  msgid "%s day"
2083
  msgid_plural "%s days"
2084
  msgstr[0] ""
2085
  msgstr[1] ""
2086
 
2087
- #: bp-core/bp-core-functions.php:831 bp-core/bp-core-functions.php:865
2088
  msgid "%s hour"
2089
  msgid_plural "%s hours"
2090
  msgstr[0] ""
2091
  msgstr[1] ""
2092
 
2093
- #: bp-core/bp-core-functions.php:834 bp-core/bp-core-functions.php:868
2094
  msgid "%s minute"
2095
  msgid_plural "%s minutes"
2096
  msgstr[0] ""
2097
  msgstr[1] ""
2098
 
2099
- #: bp-core/bp-core-functions.php:837 bp-core/bp-core-functions.php:871
2100
  msgid "%s second"
2101
  msgid_plural "%s seconds"
2102
  msgstr[0] ""
2103
  msgstr[1] ""
2104
 
2105
- #: bp-core/bp-core-functions.php:852
2106
  msgctxt "Separator in time since"
2107
  msgid ","
2108
  msgstr ""
2109
 
2110
- #: bp-core/bp-core-functions.php:1037
2111
  msgid "Not recently active"
2112
  msgstr ""
2113
 
2114
- #: bp-core/bp-core-loader.php:231 bp-members/bp-members-admin.php:722
2115
- #: bp-members/bp-members-loader.php:184 bp-xprofile/bp-xprofile-loader.php:170
2116
- #: bp-xprofile/bp-xprofile-loader.php:231
2117
- #: bp-xprofile/bp-xprofile-loader.php:263
2118
- #: bp-xprofile/bp-xprofile-loader.php:303
2119
  msgid "Profile"
2120
  msgstr ""
2121
 
@@ -2171,7 +2196,7 @@ msgid "Show a Log In form to logged-out visitors, and a Log Out link to those wh
2171
  msgstr ""
2172
 
2173
  #: bp-core/bp-core-widgets.php:82 bp-members/admin/bp-members-classes.php:127
2174
- #: bp-members/admin/bp-members-classes.php:430
2175
  #: bp-templates/bp-legacy/buddypress/members/register.php:32
2176
  #: bp-themes/bp-default/registration/register.php:37
2177
  #: bp-themes/bp-default/sidebar.php:44
@@ -2190,8 +2215,8 @@ msgstr ""
2190
  msgid "<a href=\"%s\" title=\"Register for a new account\">Register</a>"
2191
  msgstr ""
2192
 
2193
- #: bp-core/bp-core-widgets.php:133 bp-core/bp-core-widgets.php:288
2194
- #: bp-core/bp-core-widgets.php:403 bp-core/bp-core-widgets.php:505
2195
  #: bp-groups/bp-groups-widgets.php:137 bp-messages/bp-messages-widgets.php:110
2196
  #: bp-templates/bp-legacy/buddypress/forums/index.php:86
2197
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:47
@@ -2211,10 +2236,10 @@ msgctxt "widget name"
2211
  msgid "(BuddyPress) Members"
2212
  msgstr ""
2213
 
2214
- #: bp-core/bp-core-widgets.php:199 bp-core/bp-core-widgets.php:297
2215
  #: bp-core/deprecated/1.6.php:129 bp-core/deprecated/1.6.php:152
2216
  #: bp-friends/bp-friends-widgets.php:91 bp-friends/bp-friends-widgets.php:179
2217
- #: bp-groups/bp-groups-template.php:2389 bp-groups/bp-groups-widgets.php:65
2218
  #: bp-groups/bp-groups-widgets.php:146
2219
  #: bp-templates/bp-legacy/buddypress/blogs/index.php:39
2220
  #: bp-templates/bp-legacy/buddypress/members/single/blogs.php:22
@@ -2223,74 +2248,74 @@ msgstr ""
2223
  msgid "Newest"
2224
  msgstr ""
2225
 
2226
- #: bp-core/bp-core-widgets.php:200 bp-core/bp-core-widgets.php:298
2227
  #: bp-friends/bp-friends-widgets.php:92 bp-friends/bp-friends-widgets.php:180
2228
  #: bp-groups/bp-groups-widgets.php:66 bp-groups/bp-groups-widgets.php:147
2229
- #: bp-members/bp-members-admin.php:613
2230
  msgid "Active"
2231
  msgstr ""
2232
 
2233
- #: bp-core/bp-core-widgets.php:204 bp-core/bp-core-widgets.php:299
2234
  #: bp-friends/bp-friends-widgets.php:93 bp-friends/bp-friends-widgets.php:181
2235
  #: bp-groups/bp-groups-widgets.php:67 bp-groups/bp-groups-widgets.php:148
2236
  msgid "Popular"
2237
  msgstr ""
2238
 
2239
- #: bp-core/bp-core-widgets.php:241
2240
  msgid "No one has signed up yet!"
2241
  msgstr ""
2242
 
2243
- #: bp-core/bp-core-widgets.php:290 bp-friends/bp-friends-widgets.php:172
2244
  msgid "Link widget title to Members directory"
2245
  msgstr ""
2246
 
2247
- #: bp-core/bp-core-widgets.php:292
2248
  msgid "Max members to show:"
2249
  msgstr ""
2250
 
2251
- #: bp-core/bp-core-widgets.php:295
2252
  msgid "Default members to show:"
2253
  msgstr ""
2254
 
2255
- #: bp-core/bp-core-widgets.php:317
2256
  msgid "Avatars of users who are currently online"
2257
  msgstr ""
2258
 
2259
- #: bp-core/bp-core-widgets.php:320
2260
  msgctxt "widget name"
2261
  msgid "(BuddyPress) Who's Online"
2262
  msgstr ""
2263
 
2264
- #: bp-core/bp-core-widgets.php:363
2265
  msgid "There are no users currently online"
2266
  msgstr ""
2267
 
2268
- #: bp-core/bp-core-widgets.php:394
2269
  msgid "Who's Online"
2270
  msgstr ""
2271
 
2272
- #: bp-core/bp-core-widgets.php:405 bp-core/bp-core-widgets.php:507
2273
  msgid "Max Members to show:"
2274
  msgstr ""
2275
 
2276
- #: bp-core/bp-core-widgets.php:419
2277
  msgid "Avatars of recently active members"
2278
  msgstr ""
2279
 
2280
- #: bp-core/bp-core-widgets.php:422
2281
  msgctxt "widget name"
2282
  msgid "(BuddyPress) Recently Active Members"
2283
  msgstr ""
2284
 
2285
- #: bp-core/bp-core-widgets.php:465
2286
  msgid "There are no recently active members"
2287
  msgstr ""
2288
 
2289
- #: bp-core/bp-core-widgets.php:496
2290
  msgid "Recently Active Members"
2291
  msgstr ""
2292
 
2293
- #: bp-core/bp-core-widgets.php:568 bp-friends/bp-friends-widgets.php:245
2294
  msgid "There were no members found, please try another filter."
2295
  msgstr ""
2296
 
@@ -2299,12 +2324,12 @@ msgstr ""
2299
  #: bp-templates/bp-legacy/buddypress/members/single/profile/profile-wp.php:8
2300
  #: bp-themes/bp-default/activity/post-form.php:45
2301
  #: bp-themes/bp-default/members/single/profile/profile-wp.php:8
2302
- #: bp-xprofile/bp-xprofile-loader.php:320
2303
  msgid "My Profile"
2304
  msgstr ""
2305
 
2306
  #: bp-core/deprecated/1.5.php:149 bp-members/admin/bp-members-classes.php:128
2307
- #: bp-members/admin/bp-members-classes.php:431
2308
  #: bp-templates/bp-legacy/buddypress/members/single/profile/profile-wp.php:15
2309
  #: bp-themes/bp-default/functions.php:643
2310
  #: bp-themes/bp-default/members/single/profile/profile-wp.php:15
@@ -2347,12 +2372,12 @@ msgid "%1$s mentioned you in the group \"%2$s\""
2347
  msgstr ""
2348
 
2349
  #: bp-core/deprecated/1.6.php:128 bp-core/deprecated/1.6.php:149
2350
- #: bp-groups/bp-groups-template.php:2760 bp-groups/bp-groups-template.php:2782
2351
  msgid "Recently Active"
2352
  msgstr ""
2353
 
2354
  #: bp-core/deprecated/1.6.php:130 bp-core/deprecated/1.6.php:155
2355
- #: bp-groups/bp-groups-template.php:2765 bp-groups/bp-groups-template.php:2797
2356
  msgid "Alphabetically"
2357
  msgstr ""
2358
 
@@ -2404,8 +2429,8 @@ msgstr ""
2404
  msgid "Please pick the group forum where you would like to post this topic."
2405
  msgstr ""
2406
 
2407
- #: bp-forums/bp-forums-screens.php:208 bp-groups/bp-groups-template.php:1728
2408
- #: bp-groups/bp-groups-template.php:1729
2409
  #: bp-templates/bp-legacy/buddypress/groups/single/forum.php:19
2410
  #: bp-themes/bp-default/forums/index.php:23
2411
  #: bp-themes/bp-default/groups/single/forum.php:19
@@ -2425,8 +2450,8 @@ msgstr ""
2425
  #: bp-forums/bp-forums-template.php:756 bp-forums/bp-forums-template.php:870
2426
  #: bp-forums/bp-forums-template.php:2014
2427
  #: bp-messages/bp-messages-classes.php:474
2428
- #: bp-messages/bp-messages-template.php:938
2429
- #: bp-messages/bp-messages-template.php:1020
2430
  msgid "Deleted User"
2431
  msgstr ""
2432
 
@@ -2434,11 +2459,11 @@ msgstr ""
2434
  msgid "Group logo for %s"
2435
  msgstr ""
2436
 
2437
- #: bp-forums/bp-forums-template.php:1103 bp-groups/bp-groups-template.php:1051
2438
  msgid "%d post"
2439
  msgstr ""
2440
 
2441
- #: bp-forums/bp-forums-template.php:1105 bp-groups/bp-groups-template.php:1053
2442
  msgid "%d posts"
2443
  msgstr ""
2444
 
@@ -2659,7 +2684,7 @@ msgid "You already have a pending friendship request with this user"
2659
  msgstr ""
2660
 
2661
  #: bp-friends/bp-friends-actions.php:76
2662
- #: bp-templates/bp-legacy/buddypress-functions.php:1058
2663
  #: bp-themes/bp-default/_inc/ajax.php:646
2664
  msgid "Friendship could not be canceled."
2665
  msgstr ""
@@ -2712,7 +2737,7 @@ msgstr ""
2712
  msgid "Friendships"
2713
  msgstr ""
2714
 
2715
- #: bp-friends/bp-friends-loader.php:150 bp-groups/bp-groups-template.php:1496
2716
  msgid "Requests"
2717
  msgstr ""
2718
 
@@ -2801,7 +2826,7 @@ msgstr ""
2801
  msgid "A member accepts your friendship request"
2802
  msgstr ""
2803
 
2804
- #: bp-friends/bp-friends-template.php:66 bp-xprofile/bp-xprofile-loader.php:130
2805
  msgid "My Friends"
2806
  msgstr ""
2807
 
@@ -2838,7 +2863,7 @@ msgid "%d friends"
2838
  msgstr ""
2839
 
2840
  #: bp-friends/bp-friends-template.php:318
2841
- #: bp-templates/bp-legacy/buddypress-functions.php:1070
2842
  #: bp-themes/bp-default/_inc/ajax.php:658
2843
  msgid "Cancel Friendship Request"
2844
  msgstr ""
@@ -2859,8 +2884,8 @@ msgstr ""
2859
 
2860
  #: bp-friends/bp-friends-template.php:369
2861
  #: bp-friends/bp-friends-template.php:370
2862
- #: bp-templates/bp-legacy/buddypress-functions.php:1060
2863
- #: bp-templates/bp-legacy/buddypress-functions.php:1078
2864
  #: bp-themes/bp-default/_inc/ajax.php:648
2865
  #: bp-themes/bp-default/_inc/ajax.php:666
2866
  msgid "Add Friend"
@@ -2951,7 +2976,7 @@ msgstr ""
2951
  msgid "There was an error leaving the group."
2952
  msgstr ""
2953
 
2954
- #: bp-groups/bp-groups-actions.php:309 bp-groups/bp-groups-functions.php:288
2955
  msgid "You successfully left the group."
2956
  msgstr ""
2957
 
@@ -2979,7 +3004,7 @@ msgstr ""
2979
  msgid "%1$s created the group %2$s"
2980
  msgstr ""
2981
 
2982
- #: bp-groups/bp-groups-activity.php:93 bp-groups/bp-groups-activity.php:255
2983
  msgid "%1$s joined the group %2$s"
2984
  msgstr ""
2985
 
@@ -3101,7 +3126,7 @@ msgstr ""
3101
  msgid "You are about to delete the following groups:"
3102
  msgstr ""
3103
 
3104
- #: bp-groups/bp-groups-admin.php:596 bp-members/bp-members-admin.php:1373
3105
  msgid "This action cannot be undone."
3106
  msgstr ""
3107
 
@@ -3230,18 +3255,18 @@ msgstr ""
3230
 
3231
  #: bp-groups/bp-groups-admin.php:882 bp-groups/bp-groups-adminbar.php:101
3232
  #: bp-groups/bp-groups-buddybar.php:58
3233
- #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:360
3234
  #: bp-themes/bp-default/groups/single/admin.php:360
3235
  #: bp-xprofile/bp-xprofile-admin.php:118
3236
  msgid "Delete Group"
3237
  msgstr ""
3238
 
3239
- #: bp-groups/bp-groups-admin.php:886 bp-groups/bp-groups-classes.php:3108
3240
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:32
3241
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:117
3242
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:58
3243
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:74
3244
- #: bp-templates/bp-legacy/buddypress/members/single/profile/edit.php:148
3245
  #: bp-templates/bp-legacy/buddypress/members/single/settings/general.php:22
3246
  #: bp-templates/bp-legacy/buddypress/members/single/settings/notifications.php:11
3247
  #: bp-themes/bp-default/groups/single/admin.php:32
@@ -3267,7 +3292,7 @@ msgstr ""
3267
  msgid "Viewing %1$s - %2$s of %3$s"
3268
  msgstr ""
3269
 
3270
- #: bp-groups/bp-groups-admin.php:945 bp-groups/bp-groups-template.php:976
3271
  msgid "%s member"
3272
  msgid_plural "%s members"
3273
  msgstr[0] ""
@@ -3285,15 +3310,21 @@ msgstr ""
3285
 
3286
  #: bp-groups/bp-groups-admin.php:1268
3287
  msgid "Public <span class=\"count\">(%s)</span>"
3288
- msgstr ""
 
 
3289
 
3290
  #: bp-groups/bp-groups-admin.php:1269
3291
  msgid "Private <span class=\"count\">(%s)</span>"
3292
- msgstr ""
 
 
3293
 
3294
  #: bp-groups/bp-groups-admin.php:1270
3295
  msgid "Hidden <span class=\"count\">(%s)</span>"
3296
- msgstr ""
 
 
3297
 
3298
  #: bp-groups/bp-groups-admin.php:1302
3299
  msgctxt "Groups admin Group Name column header"
@@ -3356,15 +3387,15 @@ msgstr ""
3356
  msgid "Group Settings"
3357
  msgstr ""
3358
 
3359
- #: bp-groups/bp-groups-buddybar.php:40 bp-groups/bp-groups-loader.php:615
3360
  msgid "Group Avatar"
3361
  msgstr ""
3362
 
3363
- #: bp-groups/bp-groups-classes.php:1996
3364
  msgid "Group Mod"
3365
  msgstr ""
3366
 
3367
- #: bp-groups/bp-groups-classes.php:2002 bp-groups/bp-groups-functions.php:118
3368
  msgid "Group Admin"
3369
  msgstr ""
3370
 
@@ -3380,11 +3411,11 @@ msgstr ""
3380
  msgid "%1$s edited the forum topic %2$s in the group %3$s"
3381
  msgstr ""
3382
 
3383
- #: bp-groups/bp-groups-functions.php:278
3384
  msgid "As the only Admin, you cannot leave the group."
3385
  msgstr ""
3386
 
3387
- #: bp-groups/bp-groups-functions.php:638
3388
  msgid "%1$s posted an update in the group %2$s"
3389
  msgstr ""
3390
 
@@ -3405,11 +3436,11 @@ msgstr ""
3405
  msgid "You are not an admin of this group."
3406
  msgstr ""
3407
 
3408
- #: bp-groups/bp-groups-loader.php:316 bp-groups/bp-groups-template.php:1477
3409
  msgid "Details"
3410
  msgstr ""
3411
 
3412
- #: bp-groups/bp-groups-loader.php:328 bp-groups/bp-groups-template.php:1488
3413
  msgid "Avatar"
3414
  msgstr ""
3415
 
@@ -3422,7 +3453,7 @@ msgid "Groups <span class=\"%s\">%s</span>"
3422
  msgstr ""
3423
 
3424
  #: bp-groups/bp-groups-loader.php:392 bp-groups/bp-groups-loader.php:422
3425
- #: bp-groups/bp-groups-loader.php:561 bp-groups/bp-groups-loader.php:596
3426
  msgid "Memberships"
3427
  msgstr ""
3428
 
@@ -3435,44 +3466,44 @@ msgctxt "Group home navigation title"
3435
  msgid "Home"
3436
  msgstr ""
3437
 
3438
- #: bp-groups/bp-groups-loader.php:455 bp-groups/bp-groups-template.php:1842
3439
- #: bp-groups/bp-groups-template.php:1843
3440
- #: bp-templates/bp-legacy/buddypress-functions.php:1192
3441
  #: bp-themes/bp-default/_inc/ajax.php:780
3442
  msgid "Request Membership"
3443
  msgstr ""
3444
 
3445
- #: bp-groups/bp-groups-loader.php:467
3446
  msgid "Forum"
3447
  msgstr ""
3448
 
3449
- #: bp-groups/bp-groups-loader.php:479
3450
  msgid "Members <span>%s</span>"
3451
  msgstr ""
3452
 
3453
- #: bp-groups/bp-groups-loader.php:491
3454
  #: bp-templates/bp-legacy/buddypress/groups/single/invites-loop.php:90
3455
  #: bp-themes/bp-default/groups/single/send-invites.php:60
3456
  msgid "Send Invites"
3457
  msgstr ""
3458
 
3459
- #: bp-groups/bp-groups-loader.php:505
3460
  msgid "Admin"
3461
  msgstr ""
3462
 
3463
- #: bp-groups/bp-groups-loader.php:542
3464
  msgid "No Pending Invites"
3465
  msgstr ""
3466
 
3467
- #: bp-groups/bp-groups-loader.php:545
3468
  msgid "Groups <span class=\"count\">%s</span>"
3469
  msgstr ""
3470
 
3471
- #: bp-groups/bp-groups-loader.php:546
3472
  msgid "Pending Invites <span class=\"count\">%s</span>"
3473
  msgstr ""
3474
 
3475
- #: bp-groups/bp-groups-loader.php:619
3476
  msgid "No Group Avatar"
3477
  msgstr ""
3478
 
@@ -3772,7 +3803,7 @@ msgstr ""
3772
  msgid "Your avatar was deleted successfully!"
3773
  msgstr ""
3774
 
3775
- #: bp-groups/bp-groups-screens.php:651 bp-members/bp-members-admin.php:477
3776
  #: bp-xprofile/bp-xprofile-actions.php:41
3777
  msgid "There was a problem deleting that avatar, please try again."
3778
  msgstr ""
@@ -3899,37 +3930,37 @@ msgstr ""
3899
  msgid "Group creator avatar of %s"
3900
  msgstr ""
3901
 
3902
- #: bp-groups/bp-groups-template.php:791
3903
  msgid "No Admins"
3904
  msgstr ""
3905
 
3906
- #: bp-groups/bp-groups-template.php:818
3907
  msgid "No Mods"
3908
  msgstr ""
3909
 
3910
- #: bp-groups/bp-groups-template.php:900
3911
  msgid "Filter Groups"
3912
  msgstr ""
3913
 
3914
- #: bp-groups/bp-groups-template.php:948
3915
  msgid "Viewing group %1$s to %2$s (of %3$s group)"
3916
  msgid_plural "Viewing group %1$s to %2$s (of %3$s groups)"
3917
  msgstr[0] ""
3918
  msgstr[1] ""
3919
 
3920
- #: bp-groups/bp-groups-template.php:978
3921
  msgid "%s members"
3922
  msgstr ""
3923
 
3924
- #: bp-groups/bp-groups-template.php:1017
3925
  msgid "%d topic"
3926
  msgstr ""
3927
 
3928
- #: bp-groups/bp-groups-template.php:1019
3929
  msgid "%d topics"
3930
  msgstr ""
3931
 
3932
- #: bp-groups/bp-groups-template.php:1245 bp-groups/bp-groups-template.php:1310
3933
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:190
3934
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:217
3935
  #: bp-themes/bp-default/groups/single/admin.php:190
@@ -3937,16 +3968,16 @@ msgstr ""
3937
  msgid "Demote to Member"
3938
  msgstr ""
3939
 
3940
- #: bp-groups/bp-groups-template.php:1258 bp-groups/bp-groups-template.php:1323
3941
- #: bp-groups/bp-groups-template.php:2287
3942
  msgid "joined %s"
3943
  msgstr ""
3944
 
3945
- #: bp-groups/bp-groups-template.php:1281
3946
  msgid "This group has no administrators"
3947
  msgstr ""
3948
 
3949
- #: bp-groups/bp-groups-template.php:1309
3950
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:216
3951
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:272
3952
  #: bp-themes/bp-default/groups/single/admin.php:216
@@ -3954,55 +3985,55 @@ msgstr ""
3954
  msgid "Promote to Admin"
3955
  msgstr ""
3956
 
3957
- #: bp-groups/bp-groups-template.php:1343
3958
  msgid "This group has no moderators"
3959
  msgstr ""
3960
 
3961
- #: bp-groups/bp-groups-template.php:1768 bp-groups/bp-groups-template.php:1769
3962
- #: bp-templates/bp-legacy/buddypress-functions.php:1156
3963
- #: bp-templates/bp-legacy/buddypress-functions.php:1169
3964
  #: bp-themes/bp-default/_inc/ajax.php:744
3965
  #: bp-themes/bp-default/_inc/ajax.php:757
3966
  msgid "Leave Group"
3967
  msgstr ""
3968
 
3969
- #: bp-groups/bp-groups-template.php:1791 bp-groups/bp-groups-template.php:1792
3970
- #: bp-templates/bp-legacy/buddypress-functions.php:1190
3971
  #: bp-themes/bp-default/_inc/ajax.php:778
3972
  msgid "Join Group"
3973
  msgstr ""
3974
 
3975
- #: bp-groups/bp-groups-template.php:1810 bp-groups/bp-groups-template.php:1811
3976
  msgid "Accept Invitation"
3977
  msgstr ""
3978
 
3979
- #: bp-groups/bp-groups-template.php:1826 bp-groups/bp-groups-template.php:1827
3980
  msgid "Request Sent"
3981
  msgstr ""
3982
 
3983
- #: bp-groups/bp-groups-template.php:1910
3984
  msgid "This is a private group and you must request group membership in order to join."
3985
  msgstr ""
3986
 
3987
- #: bp-groups/bp-groups-template.php:1912
3988
  msgid "This is a private group. To join you must be a registered site member and request group membership."
3989
  msgstr ""
3990
 
3991
- #: bp-groups/bp-groups-template.php:1915
3992
  msgid "This is a private group. Your membership request is awaiting approval from the group administrator."
3993
  msgstr ""
3994
 
3995
- #: bp-groups/bp-groups-template.php:1919
3996
  msgid "This is a hidden group and only invited members can join."
3997
  msgstr ""
3998
 
3999
- #: bp-groups/bp-groups-template.php:2335 bp-members/bp-members-template.php:353
4000
  msgid "Viewing member %1$s to %2$s (of %3$s member)"
4001
  msgid_plural "Viewing members %1$s to %2$s (of %3$s members)"
4002
  msgstr[0] ""
4003
  msgstr[1] ""
4004
 
4005
- #: bp-groups/bp-groups-template.php:2387
4006
  #: bp-notifications/bp-notifications-template.php:940
4007
  #: bp-templates/bp-legacy/buddypress/blogs/index.php:36
4008
  #: bp-templates/bp-legacy/buddypress/forums/index.php:42
@@ -4025,11 +4056,11 @@ msgstr[1] ""
4025
  msgid "Order By:"
4026
  msgstr ""
4027
 
4028
- #: bp-groups/bp-groups-template.php:2390
4029
  msgid "Oldest"
4030
  msgstr ""
4031
 
4032
- #: bp-groups/bp-groups-template.php:2391
4033
  #: bp-templates/bp-legacy/buddypress/blogs/index.php:40
4034
  #: bp-templates/bp-legacy/buddypress/groups/index.php:42
4035
  #: bp-templates/bp-legacy/buddypress/members/index.php:41
@@ -4045,41 +4076,47 @@ msgstr ""
4045
  msgid "Alphabetical"
4046
  msgstr ""
4047
 
4048
- #: bp-groups/bp-groups-template.php:2618 bp-groups/bp-groups-template.php:2868
4049
  msgid "Group avatar"
4050
  msgstr ""
4051
 
4052
- #: bp-groups/bp-groups-template.php:2761 bp-groups/bp-groups-template.php:2785
4053
  msgid "Recently Joined"
4054