BuddyPress - Version 1.6.3

Version Description

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

Download this release

Release Info

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

Code changes from version 1.6.2 to 1.6.3

Files changed (25) hide show
  1. bp-core/bp-core-avatars.php +3 -0
  2. bp-core/bp-core-cssjs.php +1 -0
  3. bp-forums/bbpress/bb-includes/functions.bb-meta.php +1 -1
  4. bp-forums/bbpress/bb-includes/functions.bb-posts.php +5 -4
  5. bp-forums/bbpress/bb-includes/functions.bb-template.php +10 -2
  6. bp-forums/bbpress/bb-includes/functions.bb-topic-tags.php +5 -2
  7. bp-forums/bbpress/bb-login.php +3 -2
  8. bp-forums/bbpress/bb-plugins/akismet.php +7 -2
  9. bp-forums/bbpress/bb-plugins/bozo.php +1 -1
  10. bp-forums/bbpress/rss.php +1 -2
  11. bp-forums/bp-forums-functions.php +4 -2
  12. bp-groups/bp-groups-classes.php +4 -2
  13. bp-groups/bp-groups-screens.php +3 -0
  14. bp-languages/buddypress.pot +63 -63
  15. bp-loader.php +2 -2
  16. bp-messages/js/autocomplete/license.bgiframe.txt +19 -19
  17. bp-themes/bp-default/_inc/ajax.php +4 -3
  18. bp-themes/bp-default/_inc/global.js +4 -4
  19. bp-themes/bp-default/functions.php +1 -1
  20. bp-themes/bp-default/license.txt +280 -280
  21. bp-themes/bp-default/readme.txt +21 -21
  22. bp-themes/bp-default/rtl.css +1 -1
  23. bp-themes/bp-default/style.css +1 -1
  24. bp-xprofile/bp-xprofile-screens.php +3 -0
  25. readme.txt +6 -3
bp-core/bp-core-avatars.php CHANGED
@@ -548,6 +548,9 @@ function bp_core_avatar_handle_upload( $file, $upload_dir_filter ) {
548
  }
549
  }
550
 
 
 
 
551
  // We only want to handle one image after resize.
552
  if ( empty( $bp->avatar_admin->resized ) )
553
  $bp->avatar_admin->image->dir = str_replace( bp_core_avatar_upload_path(), '', $bp->avatar_admin->original['file'] );
548
  }
549
  }
550
 
551
+ if ( ! isset( $bp->avatar_admin->image ) )
552
+ $bp->avatar_admin->image = new stdClass();
553
+
554
  // We only want to handle one image after resize.
555
  if ( empty( $bp->avatar_admin->resized ) )
556
  $bp->avatar_admin->image->dir = str_replace( bp_core_avatar_upload_path(), '', $bp->avatar_admin->original['file'] );
bp-core/bp-core-cssjs.php CHANGED
@@ -28,6 +28,7 @@ add_action( 'wp_head', 'bp_core_confirmation_js', 100 );
28
  * @package BuddyPress Core
29
  */
30
  function bp_core_add_jquery_cropper() {
 
31
  wp_enqueue_script( 'jcrop', array( 'jquery' ) );
32
  add_action( 'wp_head', 'bp_core_add_cropper_inline_js' );
33
  add_action( 'wp_head', 'bp_core_add_cropper_inline_css' );
28
  * @package BuddyPress Core
29
  */
30
  function bp_core_add_jquery_cropper() {
31
+ wp_enqueue_style( 'jcrop' );
32
  wp_enqueue_script( 'jcrop', array( 'jquery' ) );
33
  add_action( 'wp_head', 'bp_core_add_cropper_inline_js' );
34
  add_action( 'wp_head', 'bp_core_add_cropper_inline_css' );
bp-forums/bbpress/bb-includes/functions.bb-meta.php CHANGED
@@ -300,7 +300,7 @@ function bb_get_option( $option )
300
  $r = $bb_locale->text_direction;
301
  break;
302
  case 'version':
303
- return '1.1'; // Don't filter
304
  break;
305
  case 'bb_db_version' :
306
  return '2471'; // Don't filter
300
  $r = $bb_locale->text_direction;
301
  break;
302
  case 'version':
303
+ return '1.2'; // Don't filter
304
  break;
305
  case 'bb_db_version' :
306
  return '2471'; // Don't filter
bp-forums/bbpress/bb-includes/functions.bb-posts.php CHANGED
@@ -626,14 +626,15 @@ function bb_get_recent_user_replies( $user_id ) {
626
  * @param int $post_id ID of new post
627
  */
628
  function bb_notify_subscribers( $post_id ) {
629
- global $bbdb, $bb_ksd_pre_post_status;
630
-
631
- if ( !empty( $bb_ksd_pre_post_status ) )
632
- return false;
633
 
634
  if ( !$post = bb_get_post( $post_id ) )
635
  return false;
636
 
 
 
 
 
637
  if ( !$topic = get_topic( $post->topic_id ) )
638
  return false;
639
 
626
  * @param int $post_id ID of new post
627
  */
628
  function bb_notify_subscribers( $post_id ) {
629
+ global $bbdb;
 
 
 
630
 
631
  if ( !$post = bb_get_post( $post_id ) )
632
  return false;
633
 
634
+ // bozo or spam
635
+ if ( 2 == $post->post_status )
636
+ return false;
637
+
638
  if ( !$topic = get_topic( $post->topic_id ) )
639
  return false;
640
 
bp-forums/bbpress/bb-includes/functions.bb-template.php CHANGED
@@ -1207,7 +1207,11 @@ function topic_last_poster( $id = 0 ) {
1207
 
1208
  function get_topic_last_poster( $id = 0 ) {
1209
  $topic = get_topic( get_topic_id( $id ) );
1210
- $user_display_name = get_post_author( $topic->topic_last_post_id );
 
 
 
 
1211
  return apply_filters( 'get_topic_last_poster', $user_display_name, $topic->topic_last_poster, $topic->topic_id ); // $topic->topic_last_poster = user ID
1212
  }
1213
 
@@ -1219,7 +1223,11 @@ function topic_author( $id = 0 ) {
1219
  function get_topic_author( $id = 0 ) {
1220
  $topic = get_topic( get_topic_id( $id ) );
1221
  $first_post = bb_get_first_post( $topic );
1222
- $user_display_name = get_post_author( $first_post->post_id );
 
 
 
 
1223
  return apply_filters( 'get_topic_author', $user_display_name, $topic->topic_poster, $topic->topic_id ); // $topic->topic_poster = user ID
1224
  }
1225
 
1207
 
1208
  function get_topic_last_poster( $id = 0 ) {
1209
  $topic = get_topic( get_topic_id( $id ) );
1210
+ if ( isset( $topic->topic_last_post_id ) && ( 1 == $topic->topic_last_post_id ) ) {
1211
+ $user_display_name = $topic->topic_poster_name;
1212
+ } else {
1213
+ $user_display_name = get_post_author( $topic->topic_last_post_id );
1214
+ }
1215
  return apply_filters( 'get_topic_last_poster', $user_display_name, $topic->topic_last_poster, $topic->topic_id ); // $topic->topic_last_poster = user ID
1216
  }
1217
 
1223
  function get_topic_author( $id = 0 ) {
1224
  $topic = get_topic( get_topic_id( $id ) );
1225
  $first_post = bb_get_first_post( $topic );
1226
+ if ( !empty( $first_post ) ) {
1227
+ $user_display_name = get_post_author( $first_post->post_id );
1228
+ } else {
1229
+ $user_display_name = $topic->topic_poster_name;
1230
+ }
1231
  return apply_filters( 'get_topic_author', $user_display_name, $topic->topic_poster, $topic->topic_id ); // $topic->topic_poster = user ID
1232
  }
1233
 
bp-forums/bbpress/bb-includes/functions.bb-topic-tags.php CHANGED
@@ -65,9 +65,12 @@ function bb_create_tag( $tag ) {
65
  if ( list($term_id, $tt_id) = $wp_taxonomy_object->is_term( $tag, 'bb_topic_tag' ) )
66
  return $tt_id;
67
 
68
- list($term_id, $tt_id) = $wp_taxonomy_object->insert_term( $tag, 'bb_topic_tag' );
 
 
69
 
70
- if ( is_wp_error($term_id) || is_wp_error($tt_id) || !$tt_id )
 
71
  return false;
72
 
73
  return $tt_id;
65
  if ( list($term_id, $tt_id) = $wp_taxonomy_object->is_term( $tag, 'bb_topic_tag' ) )
66
  return $tt_id;
67
 
68
+ $term = $wp_taxonomy_object->insert_term( $tag, 'bb_topic_tag' );
69
+ if ( is_wp_error( $term ) )
70
+ return false;
71
 
72
+ list( $term_id, $tt_id ) = $term;
73
+ if ( ! $tt_id )
74
  return false;
75
 
76
  return $tt_id;
bp-forums/bbpress/bb-login.php CHANGED
@@ -12,11 +12,11 @@ nocache_headers();
12
  /** Look for redirection ******************************************************/
13
 
14
  // Look for 'redirect_to'
15
- if ( isset( $_REQUEST['redirect_to'] ) )
16
  $re = $_REQUEST['redirect_to'];
17
 
18
  // Look for 're'
19
- if ( empty( $re ) && isset( $_REQUEST['re'] ) )
20
  $re = $_REQUEST['re'];
21
 
22
  // Use referer
@@ -31,6 +31,7 @@ if ( isset( $_REQUEST['redirect_to'] ) )
31
 
32
  if ( false !== strpos( $re, $home_path . 'register.php' ) || false !== strpos( $re, $home_path . 'bb-reset-password.php' ) )
33
  $re = bb_get_uri( null, null, BB_URI_CONTEXT_HEADER );
 
34
  }
35
 
36
  /**
12
  /** Look for redirection ******************************************************/
13
 
14
  // Look for 'redirect_to'
15
+ if ( isset( $_REQUEST['redirect_to'] ) && is_string( $_REQUEST['redirect_to'] ) )
16
  $re = $_REQUEST['redirect_to'];
17
 
18
  // Look for 're'
19
+ if ( empty( $re ) && isset( $_REQUEST['re'] ) && is_string( $_REQUEST['re'] ) )
20
  $re = $_REQUEST['re'];
21
 
22
  // Use referer
31
 
32
  if ( false !== strpos( $re, $home_path . 'register.php' ) || false !== strpos( $re, $home_path . 'bb-reset-password.php' ) )
33
  $re = bb_get_uri( null, null, BB_URI_CONTEXT_HEADER );
34
+
35
  }
36
 
37
  /**
bp-forums/bbpress/bb-plugins/akismet.php CHANGED
@@ -382,7 +382,7 @@ function bb_akismet_delete_old()
382
  }
383
  }
384
 
385
- function bb_ksd_pre_post_status( $post_status )
386
  {
387
  global $bb_current_user, $bb_ksd_pre_post_status, $bb_ksd_pre_post;
388
 
@@ -392,13 +392,18 @@ function bb_ksd_pre_post_status( $post_status )
392
  }
393
 
394
  $response = bb_ksd_submit( $bb_ksd_pre_post );
 
 
 
 
 
395
  if ( 'true' == $response[1] ) {
396
  $bb_ksd_pre_post_status = '2';
397
  return $bb_ksd_pre_post_status;
398
  }
399
  return $post_status;
400
  }
401
- add_filter( 'pre_post_status', 'bb_ksd_pre_post_status' );
402
 
403
  function bb_ksd_delete_post( $post_id, $new_status, $old_status )
404
  {
382
  }
383
  }
384
 
385
+ function bb_ksd_pre_post_status( $post_status, $post_ID )
386
  {
387
  global $bb_current_user, $bb_ksd_pre_post_status, $bb_ksd_pre_post;
388
 
392
  }
393
 
394
  $response = bb_ksd_submit( $bb_ksd_pre_post );
395
+
396
+ if ( isset( $response[1] ) ) {
397
+ bb_update_postmeta( $post_ID, 'akismet_response', $response[1] );
398
+ }
399
+
400
  if ( 'true' == $response[1] ) {
401
  $bb_ksd_pre_post_status = '2';
402
  return $bb_ksd_pre_post_status;
403
  }
404
  return $post_status;
405
  }
406
+ add_filter( 'pre_post_status', 'bb_ksd_pre_post_status', 10, 2 );
407
 
408
  function bb_ksd_delete_post( $post_id, $new_status, $old_status )
409
  {
bp-forums/bbpress/bb-plugins/bozo.php CHANGED
@@ -350,7 +350,7 @@ function bb_bozo_user_search_role_user_ids( $role_user_ids, $roles, $args )
350
  return array();
351
  }
352
 
353
- return array_intersect( $bozo_user_ids, $role_user_ids );
354
  }
355
  add_filter( 'bb_user_search_role_user_ids', 'bb_bozo_user_search_role_user_ids', 10, 3 );
356
 
350
  return array();
351
  }
352
 
353
+ return array_intersect( (array) $bozo_user_ids, $role_user_ids );
354
  }
355
  add_filter( 'bb_user_search_role_user_ids', 'bb_bozo_user_search_role_user_ids', 10, 3 );
356
 
bp-forums/bbpress/rss.php CHANGED
@@ -184,7 +184,7 @@ if ( !$bb_db_override ) {
184
  if ( !$posts ) /* We do typecasting in the template, but all themes don't have that! */
185
  $posts = array();
186
  else /* Only send 304 if there are posts */
187
- bb_send_304( $posts[0]->post_time );
188
 
189
  if (!$description = bb_get_option( 'description' ) ) {
190
  $description = $title;
@@ -196,4 +196,3 @@ $link_self = apply_filters( 'bb_link_self_rss', $link_self, $feed );
196
 
197
  bb_load_template( 'rss2.php', array('bb_db_override', 'title', 'description', 'link', 'link_self'), $feed );
198
 
199
- ?>
184
  if ( !$posts ) /* We do typecasting in the template, but all themes don't have that! */
185
  $posts = array();
186
  else /* Only send 304 if there are posts */
187
+ bb_send_304( gmdate('D, d M Y H:i:s \G\M\T', strtotime( $posts[0]->post_time ) ) );
188
 
189
  if (!$description = bb_get_option( 'description' ) ) {
190
  $description = $title;
196
 
197
  bb_load_template( 'rss2.php', array('bb_db_override', 'title', 'description', 'link', 'link_self'), $feed );
198
 
 
bp-forums/bp-forums-functions.php CHANGED
@@ -352,6 +352,8 @@ function bp_forums_total_topic_count() {
352
  * @param int $user_id The user id
353
  */
354
  function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
 
 
355
  $reply_exists = false;
356
 
357
  if ( $text && $topic_id && $user_id ) {
@@ -363,8 +365,8 @@ function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
363
  );
364
 
365
  // BB_Query's post_text parameter does a MATCH, while we need exact matches
366
- add_filter( 'get_posts_where', create_function( '$q', 'return $q . " AND p.post_text = \'' . $text . '\'";' ) );
367
-
368
  $query = new BB_Query( 'post', $args );
369
 
370
  $reply_exists = !empty( $query->results );
352
  * @param int $user_id The user id
353
  */
354
  function bp_forums_reply_exists( $text = '', $topic_id = 0, $user_id = 0 ) {
355
+ global $wpdb;
356
+
357
  $reply_exists = false;
358
 
359
  if ( $text && $topic_id && $user_id ) {
365
  );
366
 
367
  // BB_Query's post_text parameter does a MATCH, while we need exact matches
368
+ add_filter( 'get_posts_where', create_function( '$q', 'return $q . " AND p.post_text = \'' . $wpdb->escape( $text ) . '\'";' ) );
369
+
370
  $query = new BB_Query( 'post', $args );
371
 
372
  $reply_exists = !empty( $query->results );
bp-groups/bp-groups-classes.php CHANGED
@@ -1180,8 +1180,10 @@ class BP_Groups_Member {
1180
  $banned_sql = " AND is_banned = 0";
1181
 
1182
  $exclude_sql = '';
1183
- if ( !empty( $exclude ) )
 
1184
  $exclude_sql = " AND m.user_id NOT IN ({$exclude})";
 
1185
 
1186
  if ( bp_is_active( 'xprofile' ) )
1187
  $members = $wpdb->get_results( apply_filters( 'bp_group_members_user_join_filter', $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) ) );
@@ -1394,4 +1396,4 @@ function bp_register_group_extension( $group_extension_class ) {
1394
  add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "bp_actions", array( &$extension, "_register" ), 8 );' ), 11 );
1395
  }
1396
 
1397
- ?>
1180
  $banned_sql = " AND is_banned = 0";
1181
 
1182
  $exclude_sql = '';
1183
+ if ( !empty( $exclude ) ) {
1184
+ $exclude = implode( ',', wp_parse_id_list( $exclude ) );
1185
  $exclude_sql = " AND m.user_id NOT IN ({$exclude})";
1186
+ }
1187
 
1188
  if ( bp_is_active( 'xprofile' ) )
1189
  $members = $wpdb->get_results( apply_filters( 'bp_group_members_user_join_filter', $wpdb->prepare( "SELECT m.user_id, m.date_modified, m.is_banned, u.user_login, u.user_nicename, u.user_email, pd.value as display_name FROM {$bp->groups->table_name_members} m, {$wpdb->users} u, {$bp->profile->table_name_data} pd WHERE u.ID = m.user_id AND u.ID = pd.user_id AND pd.field_id = 1 AND group_id = %d AND is_confirmed = 1 {$banned_sql} {$exclude_admins_sql} {$exclude_sql} ORDER BY m.date_modified DESC {$pag_sql}", $group_id ) ) );
1396
  add_action( 'bp_init', create_function( '', '$extension = new ' . $group_extension_class . '; add_action( "bp_actions", array( &$extension, "_register" ), 8 );' ), 11 );
1397
  }
1398
 
1399
+ ?>
bp-groups/bp-groups-screens.php CHANGED
@@ -575,6 +575,9 @@ function groups_screen_group_admin_avatar() {
575
 
576
  }
577
 
 
 
 
578
  $bp->avatar_admin->step = 'upload-image';
579
 
580
  if ( !empty( $_FILES ) ) {
575
 
576
  }
577
 
578
+ if ( ! isset( $bp->avatar_admin ) )
579
+ $bp->avatar_admin = new stdClass();
580
+
581
  $bp->avatar_admin->step = 'upload-image';
582
 
583
  if ( !empty( $_FILES ) ) {
bp-languages/buddypress.pot CHANGED
@@ -1,14 +1,14 @@
1
- # Copyright (C) 2012 BuddyPress
2
  # This file is distributed under the same license as the BuddyPress package.
3
  msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
- "POT-Creation-Date: 2012-12-10 06:36:53+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
- "PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n"
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
14
 
@@ -522,7 +522,7 @@ msgstr ""
522
  #: bp-core/bp-core-template.php:260 bp-groups/bp-groups-activity.php:143
523
  #: bp-groups/bp-groups-activity.php:179 bp-groups/bp-groups-activity.php:215
524
  #: bp-groups/bp-groups-activity.php:251 bp-groups/bp-groups-loader.php:502
525
- #: bp-groups/bp-groups-screens.php:844 bp-groups/bp-groups-widgets.php:28
526
  #: bp-groups/bp-groups-widgets.php:48 bp-groups/bp-groups-widgets.php:119
527
  msgid "Groups"
528
  msgstr ""
@@ -634,7 +634,7 @@ msgid "You do not have access to this activity."
634
  msgstr ""
635
 
636
  #: bp-activity/bp-activity-screens.php:279 bp-blogs/bp-blogs-template.php:499
637
- #: bp-friends/bp-friends-screens.php:84 bp-groups/bp-groups-screens.php:845
638
  #: bp-messages/bp-messages-screens.php:149
639
  #: bp-themes/bp-default/groups/single/admin.php:26
640
  #: bp-themes/bp-default/registration/register.php:227
@@ -642,7 +642,7 @@ msgid "Yes"
642
  msgstr ""
643
 
644
  #: bp-activity/bp-activity-screens.php:280 bp-blogs/bp-blogs-template.php:503
645
- #: bp-friends/bp-friends-screens.php:85 bp-groups/bp-groups-screens.php:846
646
  #: bp-messages/bp-messages-screens.php:150
647
  #: bp-themes/bp-default/groups/single/admin.php:27
648
  #: bp-themes/bp-default/registration/register.php:228
@@ -1755,11 +1755,11 @@ msgstr ""
1755
  msgid "Upload Failed! Error was: %s"
1756
  msgstr ""
1757
 
1758
- #: bp-core/bp-core-avatars.php:561
1759
  msgid "Upload failed! Error was: %s"
1760
  msgstr ""
1761
 
1762
- #: bp-core/bp-core-avatars.php:696 bp-core/bp-core-classes.php:174
1763
  #: bp-core/bp-core-classes.php:175 bp-core/bp-core-classes.php:176
1764
  #: bp-core/bp-core-template.php:98 bp-core/bp-core-template.php:107
1765
  msgid "Avatar of %s"
@@ -2415,7 +2415,7 @@ msgstr ""
2415
  msgid "You already have a pending friendship request with this user"
2416
  msgstr ""
2417
 
2418
- #: bp-friends/bp-friends-actions.php:70 bp-themes/bp-default/_inc/ajax.php:600
2419
  msgid "Friendship could not be canceled."
2420
  msgstr ""
2421
 
@@ -2589,7 +2589,7 @@ msgid "%d friends"
2589
  msgstr ""
2590
 
2591
  #: bp-friends/bp-friends-template.php:285
2592
- #: bp-themes/bp-default/_inc/ajax.php:610
2593
  msgid "Cancel Friendship Request"
2594
  msgstr ""
2595
 
@@ -2604,8 +2604,8 @@ msgstr ""
2604
 
2605
  #: bp-friends/bp-friends-template.php:319
2606
  #: bp-friends/bp-friends-template.php:320
2607
- #: bp-themes/bp-default/_inc/ajax.php:602
2608
- #: bp-themes/bp-default/_inc/ajax.php:616
2609
  msgid "Add Friend"
2610
  msgstr ""
2611
 
@@ -2645,7 +2645,7 @@ msgstr ""
2645
  msgid "You joined the group!"
2646
  msgstr ""
2647
 
2648
- #: bp-groups/bp-groups-actions.php:254 bp-groups/bp-groups-screens.php:660
2649
  msgid "This group must have at least one admin"
2650
  msgstr ""
2651
 
@@ -2848,7 +2848,7 @@ msgid "Home"
2848
  msgstr ""
2849
 
2850
  #: bp-groups/bp-groups-loader.php:412 bp-groups/bp-groups-template.php:1580
2851
- #: bp-groups/bp-groups-template.php:1581 bp-themes/bp-default/_inc/ajax.php:708
2852
  msgid "Request Membership"
2853
  msgstr ""
2854
 
@@ -3112,91 +3112,91 @@ msgstr ""
3112
  msgid "There was a problem deleting that avatar, please try again."
3113
  msgstr ""
3114
 
3115
- #: bp-groups/bp-groups-screens.php:602
3116
  msgid "There was a problem cropping the avatar, please try uploading it again"
3117
  msgstr ""
3118
 
3119
- #: bp-groups/bp-groups-screens.php:604
3120
  msgid "The new group avatar was uploaded successfully!"
3121
  msgstr ""
3122
 
3123
- #: bp-groups/bp-groups-screens.php:639
3124
  msgid "There was an error when promoting that user, please try again"
3125
  msgstr ""
3126
 
3127
- #: bp-groups/bp-groups-screens.php:641
3128
  msgid "User promoted successfully"
3129
  msgstr ""
3130
 
3131
- #: bp-groups/bp-groups-screens.php:664
3132
  msgid "There was an error when demoting that user, please try again"
3133
  msgstr ""
3134
 
3135
- #: bp-groups/bp-groups-screens.php:666
3136
  msgid "User demoted successfully"
3137
  msgstr ""
3138
 
3139
- #: bp-groups/bp-groups-screens.php:682
3140
  msgid "There was an error when banning that user, please try again"
3141
  msgstr ""
3142
 
3143
- #: bp-groups/bp-groups-screens.php:684
3144
  msgid "User banned successfully"
3145
  msgstr ""
3146
 
3147
- #: bp-groups/bp-groups-screens.php:700
3148
  msgid "There was an error when unbanning that user, please try again"
3149
  msgstr ""
3150
 
3151
- #: bp-groups/bp-groups-screens.php:702
3152
  msgid "User ban removed successfully"
3153
  msgstr ""
3154
 
3155
- #: bp-groups/bp-groups-screens.php:718
3156
  msgid "There was an error removing that user from the group, please try again"
3157
  msgstr ""
3158
 
3159
- #: bp-groups/bp-groups-screens.php:720
3160
  msgid "User removed successfully"
3161
  msgstr ""
3162
 
3163
- #: bp-groups/bp-groups-screens.php:758
3164
  msgid "There was an error accepting the membership request, please try again."
3165
  msgstr ""
3166
 
3167
- #: bp-groups/bp-groups-screens.php:760
3168
  msgid "Group membership request accepted"
3169
  msgstr ""
3170
 
3171
- #: bp-groups/bp-groups-screens.php:769
3172
  msgid "There was an error rejecting the membership request, please try again."
3173
  msgstr ""
3174
 
3175
- #: bp-groups/bp-groups-screens.php:771
3176
  msgid "Group membership request rejected"
3177
  msgstr ""
3178
 
3179
- #: bp-groups/bp-groups-screens.php:801
3180
  msgid "There was an error deleting the group, please try again."
3181
  msgstr ""
3182
 
3183
- #: bp-groups/bp-groups-screens.php:803
3184
  msgid "The group was deleted successfully"
3185
  msgstr ""
3186
 
3187
- #: bp-groups/bp-groups-screens.php:853
3188
  msgid "A member invites you to join a group"
3189
  msgstr ""
3190
 
3191
- #: bp-groups/bp-groups-screens.php:859
3192
  msgid "Group information is updated"
3193
  msgstr ""
3194
 
3195
- #: bp-groups/bp-groups-screens.php:865
3196
  msgid "You are promoted to a group administrator or moderator"
3197
  msgstr ""
3198
 
3199
- #: bp-groups/bp-groups-screens.php:871
3200
  msgid "A member requests to join a private group for which you are an admin"
3201
  msgstr ""
3202
 
@@ -3299,12 +3299,12 @@ msgid "New Topic"
3299
  msgstr ""
3300
 
3301
  #: bp-groups/bp-groups-template.php:1539 bp-groups/bp-groups-template.php:1540
3302
- #: bp-themes/bp-default/_inc/ajax.php:689
3303
  msgid "Leave Group"
3304
  msgstr ""
3305
 
3306
  #: bp-groups/bp-groups-template.php:1562 bp-groups/bp-groups-template.php:1563
3307
- #: bp-themes/bp-default/_inc/ajax.php:706
3308
  msgid "Join Group"
3309
  msgstr ""
3310
 
@@ -3634,7 +3634,7 @@ msgid "There was an error deleting messages."
3634
  msgstr ""
3635
 
3636
  #: bp-messages/bp-messages-actions.php:110
3637
- #: bp-themes/bp-default/_inc/ajax.php:853
3638
  msgid "Messages deleted."
3639
  msgstr ""
3640
 
@@ -3839,7 +3839,7 @@ msgid "%d Recipients"
3839
  msgstr ""
3840
 
3841
  #: bp-messages/bp-messages-template.php:922
3842
- #: bp-themes/bp-default/_inc/ajax.php:760
3843
  msgid "Sent %s"
3844
  msgstr ""
3845
 
@@ -3916,84 +3916,84 @@ msgstr ""
3916
  msgid "There was a problem posting your update, please try again."
3917
  msgstr ""
3918
 
3919
- #: bp-themes/bp-default/_inc/ajax.php:379
3920
- #: bp-themes/bp-default/_inc/ajax.php:415
3921
  msgid "There was a problem when deleting. Please try again."
3922
  msgstr ""
3923
 
3924
- #: bp-themes/bp-default/_inc/ajax.php:478
3925
- #: bp-themes/bp-default/_inc/ajax.php:499
3926
  #: bp-themes/bp-default/activity/entry.php:72
3927
  #: bp-themes/bp-default/functions.php:167
3928
  msgid "Remove Favorite"
3929
  msgstr ""
3930
 
3931
- #: bp-themes/bp-default/_inc/ajax.php:480
3932
- #: bp-themes/bp-default/_inc/ajax.php:497
3933
  #: bp-themes/bp-default/activity/entry.php:68
3934
  #: bp-themes/bp-default/functions.php:166
3935
  msgid "Favorite"
3936
  msgstr ""
3937
 
3938
- #: bp-themes/bp-default/_inc/ajax.php:569
3939
  #: bp-themes/bp-default/groups/create.php:229
3940
  #: bp-themes/bp-default/groups/single/send-invites.php:42
3941
  msgid "Remove Invite"
3942
  msgstr ""
3943
 
3944
- #: bp-themes/bp-default/_inc/ajax.php:608
3945
  msgid " Friendship could not be requested."
3946
  msgstr ""
3947
 
3948
- #: bp-themes/bp-default/_inc/ajax.php:618
3949
  msgid "Friendship request could not be cancelled."
3950
  msgstr ""
3951
 
3952
- #: bp-themes/bp-default/_inc/ajax.php:621
3953
  msgid "Request Pending"
3954
  msgstr ""
3955
 
3956
- #: bp-themes/bp-default/_inc/ajax.php:641
3957
  msgid "There was a problem accepting that request. Please try again."
3958
  msgstr ""
3959
 
3960
- #: bp-themes/bp-default/_inc/ajax.php:660
3961
  msgid "There was a problem rejecting that request. Please try again."
3962
  msgstr ""
3963
 
3964
- #: bp-themes/bp-default/_inc/ajax.php:687
3965
  msgid "Error joining group"
3966
  msgstr ""
3967
 
3968
- #: bp-themes/bp-default/_inc/ajax.php:695
3969
  msgid "Error requesting membership"
3970
  msgstr ""
3971
 
3972
- #: bp-themes/bp-default/_inc/ajax.php:697
3973
  msgid "Membership Requested"
3974
  msgstr ""
3975
 
3976
- #: bp-themes/bp-default/_inc/ajax.php:704
3977
  msgid "Error leaving group"
3978
  msgstr ""
3979
 
3980
- #: bp-themes/bp-default/_inc/ajax.php:726
3981
  msgid "There was a problem closing the notice."
3982
  msgstr ""
3983
 
3984
- #: bp-themes/bp-default/_inc/ajax.php:777
3985
  msgid "There was a problem sending that reply. Please try again."
3986
  msgstr ""
3987
 
3988
- #: bp-themes/bp-default/_inc/ajax.php:795
3989
  msgid "There was a problem marking messages as unread."
3990
  msgstr ""
3991
 
3992
- #: bp-themes/bp-default/_inc/ajax.php:820
3993
  msgid "There was a problem marking messages as read."
3994
  msgstr ""
3995
 
3996
- #: bp-themes/bp-default/_inc/ajax.php:845
3997
  msgid "There was a problem deleting messages."
3998
  msgstr ""
3999
 
@@ -5515,11 +5515,11 @@ msgstr ""
5515
  msgid "Changes saved."
5516
  msgstr ""
5517
 
5518
- #: bp-xprofile/bp-xprofile-screens.php:180
5519
  msgid "There was a problem cropping your avatar, please try uploading it again"
5520
  msgstr ""
5521
 
5522
- #: bp-xprofile/bp-xprofile-screens.php:182
5523
  msgid "Your new avatar was uploaded successfully!"
5524
  msgstr ""
5525
 
1
+ # Copyright (C) 2013 BuddyPress
2
  # This file is distributed under the same license as the BuddyPress package.
3
  msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2013-01-06 19:36:53+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
11
+ "PO-Revision-Date: 2013-MO-DA HO:MI+ZONE\n"
12
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13
  "Language-Team: LANGUAGE <LL@li.org>\n"
14
 
522
  #: bp-core/bp-core-template.php:260 bp-groups/bp-groups-activity.php:143
523
  #: bp-groups/bp-groups-activity.php:179 bp-groups/bp-groups-activity.php:215
524
  #: bp-groups/bp-groups-activity.php:251 bp-groups/bp-groups-loader.php:502
525
+ #: bp-groups/bp-groups-screens.php:847 bp-groups/bp-groups-widgets.php:28
526
  #: bp-groups/bp-groups-widgets.php:48 bp-groups/bp-groups-widgets.php:119
527
  msgid "Groups"
528
  msgstr ""
634
  msgstr ""
635
 
636
  #: bp-activity/bp-activity-screens.php:279 bp-blogs/bp-blogs-template.php:499
637
+ #: bp-friends/bp-friends-screens.php:84 bp-groups/bp-groups-screens.php:848
638
  #: bp-messages/bp-messages-screens.php:149
639
  #: bp-themes/bp-default/groups/single/admin.php:26
640
  #: bp-themes/bp-default/registration/register.php:227
642
  msgstr ""
643
 
644
  #: bp-activity/bp-activity-screens.php:280 bp-blogs/bp-blogs-template.php:503
645
+ #: bp-friends/bp-friends-screens.php:85 bp-groups/bp-groups-screens.php:849
646
  #: bp-messages/bp-messages-screens.php:150
647
  #: bp-themes/bp-default/groups/single/admin.php:27
648
  #: bp-themes/bp-default/registration/register.php:228
1755
  msgid "Upload Failed! Error was: %s"
1756
  msgstr ""
1757
 
1758
+ #: bp-core/bp-core-avatars.php:564
1759
  msgid "Upload failed! Error was: %s"
1760
  msgstr ""
1761
 
1762
+ #: bp-core/bp-core-avatars.php:699 bp-core/bp-core-classes.php:174
1763
  #: bp-core/bp-core-classes.php:175 bp-core/bp-core-classes.php:176
1764
  #: bp-core/bp-core-template.php:98 bp-core/bp-core-template.php:107
1765
  msgid "Avatar of %s"
2415
  msgid "You already have a pending friendship request with this user"
2416
  msgstr ""
2417
 
2418
+ #: bp-friends/bp-friends-actions.php:70 bp-themes/bp-default/_inc/ajax.php:601
2419
  msgid "Friendship could not be canceled."
2420
  msgstr ""
2421
 
2589
  msgstr ""
2590
 
2591
  #: bp-friends/bp-friends-template.php:285
2592
+ #: bp-themes/bp-default/_inc/ajax.php:611
2593
  msgid "Cancel Friendship Request"
2594
  msgstr ""
2595
 
2604
 
2605
  #: bp-friends/bp-friends-template.php:319
2606
  #: bp-friends/bp-friends-template.php:320
2607
+ #: bp-themes/bp-default/_inc/ajax.php:603
2608
+ #: bp-themes/bp-default/_inc/ajax.php:617
2609
  msgid "Add Friend"
2610
  msgstr ""
2611
 
2645
  msgid "You joined the group!"
2646
  msgstr ""
2647
 
2648
+ #: bp-groups/bp-groups-actions.php:254 bp-groups/bp-groups-screens.php:663
2649
  msgid "This group must have at least one admin"
2650
  msgstr ""
2651
 
2848
  msgstr ""
2849
 
2850
  #: bp-groups/bp-groups-loader.php:412 bp-groups/bp-groups-template.php:1580
2851
+ #: bp-groups/bp-groups-template.php:1581 bp-themes/bp-default/_inc/ajax.php:709
2852
  msgid "Request Membership"
2853
  msgstr ""
2854
 
3112
  msgid "There was a problem deleting that avatar, please try again."
3113
  msgstr ""
3114
 
3115
+ #: bp-groups/bp-groups-screens.php:605
3116
  msgid "There was a problem cropping the avatar, please try uploading it again"
3117
  msgstr ""
3118
 
3119
+ #: bp-groups/bp-groups-screens.php:607
3120
  msgid "The new group avatar was uploaded successfully!"
3121
  msgstr ""
3122
 
3123
+ #: bp-groups/bp-groups-screens.php:642
3124
  msgid "There was an error when promoting that user, please try again"
3125
  msgstr ""
3126
 
3127
+ #: bp-groups/bp-groups-screens.php:644
3128
  msgid "User promoted successfully"
3129
  msgstr ""
3130
 
3131
+ #: bp-groups/bp-groups-screens.php:667
3132
  msgid "There was an error when demoting that user, please try again"
3133
  msgstr ""
3134
 
3135
+ #: bp-groups/bp-groups-screens.php:669
3136
  msgid "User demoted successfully"
3137
  msgstr ""
3138
 
3139
+ #: bp-groups/bp-groups-screens.php:685
3140
  msgid "There was an error when banning that user, please try again"
3141
  msgstr ""
3142
 
3143
+ #: bp-groups/bp-groups-screens.php:687
3144
  msgid "User banned successfully"
3145
  msgstr ""
3146
 
3147
+ #: bp-groups/bp-groups-screens.php:703
3148
  msgid "There was an error when unbanning that user, please try again"
3149
  msgstr ""
3150
 
3151
+ #: bp-groups/bp-groups-screens.php:705
3152
  msgid "User ban removed successfully"
3153
  msgstr ""
3154
 
3155
+ #: bp-groups/bp-groups-screens.php:721
3156
  msgid "There was an error removing that user from the group, please try again"
3157
  msgstr ""
3158
 
3159
+ #: bp-groups/bp-groups-screens.php:723
3160
  msgid "User removed successfully"
3161
  msgstr ""
3162
 
3163
+ #: bp-groups/bp-groups-screens.php:761
3164
  msgid "There was an error accepting the membership request, please try again."
3165
  msgstr ""
3166
 
3167
+ #: bp-groups/bp-groups-screens.php:763
3168
  msgid "Group membership request accepted"
3169
  msgstr ""
3170
 
3171
+ #: bp-groups/bp-groups-screens.php:772
3172
  msgid "There was an error rejecting the membership request, please try again."
3173
  msgstr ""
3174
 
3175
+ #: bp-groups/bp-groups-screens.php:774
3176
  msgid "Group membership request rejected"
3177
  msgstr ""
3178
 
3179
+ #: bp-groups/bp-groups-screens.php:804
3180
  msgid "There was an error deleting the group, please try again."
3181
  msgstr ""
3182
 
3183
+ #: bp-groups/bp-groups-screens.php:806
3184
  msgid "The group was deleted successfully"
3185
  msgstr ""
3186
 
3187
+ #: bp-groups/bp-groups-screens.php:856
3188
  msgid "A member invites you to join a group"
3189
  msgstr ""
3190
 
3191
+ #: bp-groups/bp-groups-screens.php:862
3192
  msgid "Group information is updated"
3193
  msgstr ""
3194
 
3195
+ #: bp-groups/bp-groups-screens.php:868
3196
  msgid "You are promoted to a group administrator or moderator"
3197
  msgstr ""
3198
 
3199
+ #: bp-groups/bp-groups-screens.php:874
3200
  msgid "A member requests to join a private group for which you are an admin"
3201
  msgstr ""
3202
 
3299
  msgstr ""
3300
 
3301
  #: bp-groups/bp-groups-template.php:1539 bp-groups/bp-groups-template.php:1540
3302
+ #: bp-themes/bp-default/_inc/ajax.php:690
3303
  msgid "Leave Group"
3304
  msgstr ""
3305
 
3306
  #: bp-groups/bp-groups-template.php:1562 bp-groups/bp-groups-template.php:1563
3307
+ #: bp-themes/bp-default/_inc/ajax.php:707
3308
  msgid "Join Group"
3309
  msgstr ""
3310
 
3634
  msgstr ""
3635
 
3636
  #: bp-messages/bp-messages-actions.php:110
3637
+ #: bp-themes/bp-default/_inc/ajax.php:854
3638
  msgid "Messages deleted."
3639
  msgstr ""
3640
 
3839
  msgstr ""
3840
 
3841
  #: bp-messages/bp-messages-template.php:922
3842
+ #: bp-themes/bp-default/_inc/ajax.php:761
3843
  msgid "Sent %s"
3844
  msgstr ""
3845
 
3916
  msgid "There was a problem posting your update, please try again."
3917
  msgstr ""
3918
 
3919
+ #: bp-themes/bp-default/_inc/ajax.php:380
3920
+ #: bp-themes/bp-default/_inc/ajax.php:416
3921
  msgid "There was a problem when deleting. Please try again."
3922
  msgstr ""
3923
 
3924
+ #: bp-themes/bp-default/_inc/ajax.php:479
3925
+ #: bp-themes/bp-default/_inc/ajax.php:500
3926
  #: bp-themes/bp-default/activity/entry.php:72
3927
  #: bp-themes/bp-default/functions.php:167
3928
  msgid "Remove Favorite"
3929
  msgstr ""
3930
 
3931
+ #: bp-themes/bp-default/_inc/ajax.php:481
3932
+ #: bp-themes/bp-default/_inc/ajax.php:498
3933
  #: bp-themes/bp-default/activity/entry.php:68
3934
  #: bp-themes/bp-default/functions.php:166
3935
  msgid "Favorite"
3936
  msgstr ""
3937
 
3938
+ #: bp-themes/bp-default/_inc/ajax.php:570
3939
  #: bp-themes/bp-default/groups/create.php:229
3940
  #: bp-themes/bp-default/groups/single/send-invites.php:42
3941
  msgid "Remove Invite"
3942
  msgstr ""
3943
 
3944
+ #: bp-themes/bp-default/_inc/ajax.php:609
3945
  msgid " Friendship could not be requested."
3946
  msgstr ""
3947
 
3948
+ #: bp-themes/bp-default/_inc/ajax.php:619
3949
  msgid "Friendship request could not be cancelled."
3950
  msgstr ""
3951
 
3952
+ #: bp-themes/bp-default/_inc/ajax.php:622
3953
  msgid "Request Pending"
3954
  msgstr ""
3955
 
3956
+ #: bp-themes/bp-default/_inc/ajax.php:642
3957
  msgid "There was a problem accepting that request. Please try again."
3958
  msgstr ""
3959
 
3960
+ #: bp-themes/bp-default/_inc/ajax.php:661
3961
  msgid "There was a problem rejecting that request. Please try again."
3962
  msgstr ""
3963
 
3964
+ #: bp-themes/bp-default/_inc/ajax.php:688
3965
  msgid "Error joining group"
3966
  msgstr ""
3967
 
3968
+ #: bp-themes/bp-default/_inc/ajax.php:696
3969
  msgid "Error requesting membership"
3970
  msgstr ""
3971
 
3972
+ #: bp-themes/bp-default/_inc/ajax.php:698
3973
  msgid "Membership Requested"
3974
  msgstr ""
3975
 
3976
+ #: bp-themes/bp-default/_inc/ajax.php:705
3977
  msgid "Error leaving group"
3978
  msgstr ""
3979
 
3980
+ #: bp-themes/bp-default/_inc/ajax.php:727
3981
  msgid "There was a problem closing the notice."
3982
  msgstr ""
3983
 
3984
+ #: bp-themes/bp-default/_inc/ajax.php:778
3985
  msgid "There was a problem sending that reply. Please try again."
3986
  msgstr ""
3987
 
3988
+ #: bp-themes/bp-default/_inc/ajax.php:796
3989
  msgid "There was a problem marking messages as unread."
3990
  msgstr ""
3991
 
3992
+ #: bp-themes/bp-default/_inc/ajax.php:821
3993
  msgid "There was a problem marking messages as read."
3994
  msgstr ""
3995
 
3996
+ #: bp-themes/bp-default/_inc/ajax.php:846
3997
  msgid "There was a problem deleting messages."
3998
  msgstr ""
3999
 
5515
  msgid "Changes saved."
5516
  msgstr ""
5517
 
5518
+ #: bp-xprofile/bp-xprofile-screens.php:183
5519
  msgid "There was a problem cropping your avatar, please try uploading it again"
5520
  msgstr ""
5521
 
5522
+ #: bp-xprofile/bp-xprofile-screens.php:185
5523
  msgid "Your new avatar was uploaded successfully!"
5524
  msgstr ""
5525
 
bp-loader.php CHANGED
@@ -14,7 +14,7 @@
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
- * Version: 1.6.2
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
@@ -52,7 +52,7 @@ class BuddyPress {
52
  /**
53
  * @var string BuddyPress version
54
  */
55
- public $version = '1.6.2';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
14
  * Description: Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress.
15
  * Author: The BuddyPress Community
16
  * Author URI: http://buddypress.org/community/members/
17
+ * Version: 1.6.3
18
  * Text Domain: buddypress
19
  * Domain Path: /bp-languages/
20
  */
52
  /**
53
  * @var string BuddyPress version
54
  */
55
+ public $version = '1.6.3';
56
 
57
  /**
58
  * @var int Database version of current BuddyPress files
bp-messages/js/autocomplete/license.bgiframe.txt CHANGED
@@ -1,20 +1,20 @@
1
- Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
2
-
3
- Permission is hereby granted, free of charge, to any person obtaining
4
- a copy of this software and associated documentation files (the
5
- "Software"), to deal in the Software without restriction, including
6
- without limitation the rights to use, copy, modify, merge, publish,
7
- distribute, sublicense, and/or sell copies of the Software, and to
8
- permit persons to whom the Software is furnished to do so, subject to
9
- the following conditions:
10
-
11
- The above copyright notice and this permission notice shall be
12
- included in all copies or substantial portions of the Software.
13
-
14
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1
+ Copyright 2010, Brandon Aaron (http://brandonaaron.net/)
2
+
3
+ Permission is hereby granted, free of charge, to any person obtaining
4
+ a copy of this software and associated documentation files (the
5
+ "Software"), to deal in the Software without restriction, including
6
+ without limitation the rights to use, copy, modify, merge, publish,
7
+ distribute, sublicense, and/or sell copies of the Software, and to
8
+ permit persons to whom the Software is furnished to do so, subject to
9
+ the following conditions:
10
+
11
+ The above copyright notice and this permission notice shall be
12
+ included in all copies or substantial portions of the Software.
13
+
14
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
15
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
17
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
18
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
19
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
20
  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bp-themes/bp-default/_inc/ajax.php CHANGED
@@ -279,7 +279,7 @@ function bp_dtheme_post_update() {
279
 
280
  if ( bp_has_activities ( 'include=' . $activity_id ) ) {
281
  while ( bp_activities() ) {
282
- bp_the_activity();
283
  locate_template( array( 'activity/entry.php' ), true );
284
  }
285
  }
@@ -326,6 +326,7 @@ function bp_dtheme_new_activity_comment() {
326
  bp_has_activities( 'display_comments=stream&hide_spam=false&include=' . $comment_id );
327
 
328
  // Swap the current comment with the activity item we just loaded
 
329
  $activities_template->activity->id = $activities_template->activities[0]->item_id;
330
  $activities_template->activity->current_comment = $activities_template->activities[0];
331
 
@@ -351,7 +352,7 @@ function bp_dtheme_new_activity_comment() {
351
  *
352
  * @return mixed String on error, void on success
353
  * @since BuddyPress (1.2)
354
- */
355
  function bp_dtheme_delete_activity() {
356
  // Bail if not a POST action
357
  if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
@@ -609,7 +610,7 @@ function bp_dtheme_ajax_addremove_friend() {
609
  else
610
  echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Cancel Friendship Request', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . (int) $_POST['fid'] . '/', 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
611
 
612
- } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), (int) $_POST['fid'] ) ) {
613
  check_ajax_referer( 'friends_withdraw_friendship' );
614
 
615
  if ( friends_withdraw_friendship( bp_loggedin_user_id(), (int) $_POST['fid'] ) )
279
 
280
  if ( bp_has_activities ( 'include=' . $activity_id ) ) {
281
  while ( bp_activities() ) {
282
+ bp_the_activity();
283
  locate_template( array( 'activity/entry.php' ), true );
284
  }
285
  }
326
  bp_has_activities( 'display_comments=stream&hide_spam=false&include=' . $comment_id );
327
 
328
  // Swap the current comment with the activity item we just loaded
329
+ $activities_template->activity = new stdClass();
330
  $activities_template->activity->id = $activities_template->activities[0]->item_id;
331
  $activities_template->activity->current_comment = $activities_template->activities[0];
332
 
352
  *
353
  * @return mixed String on error, void on success
354
  * @since BuddyPress (1.2)
355
+ */
356
  function bp_dtheme_delete_activity() {
357
  // Bail if not a POST action
358
  if ( 'POST' !== strtoupper( $_SERVER['REQUEST_METHOD'] ) )
610
  else
611
  echo '<a id="friend-' . $_POST['fid'] . '" class="remove" rel="remove" title="' . __( 'Cancel Friendship Request', 'buddypress' ) . '" href="' . wp_nonce_url( bp_loggedin_user_domain() . bp_get_friends_slug() . '/requests/cancel/' . (int) $_POST['fid'] . '/', 'friends_withdraw_friendship' ) . '" class="requested">' . __( 'Cancel Friendship Request', 'buddypress' ) . '</a>';
612
 
613
+ } elseif ( 'pending' == BP_Friends_Friendship::check_is_friend( bp_loggedin_user_id(), (int) $_POST['fid'] ) ) {
614
  check_ajax_referer( 'friends_withdraw_friendship' );
615
 
616
  if ( friends_withdraw_friendship( bp_loggedin_user_id(), (int) $_POST['fid'] ) )
bp-themes/bp-default/_inc/global.js CHANGED
@@ -399,9 +399,9 @@ jq(document).ready( function() {
399
 
400
  /* Activity comment posting */
401
  if ( target.attr('name') == 'ac_form_submit' ) {
402
- var form = target.parent().parent();
403
  var form_parent = form.parent();
404
- var form_id = form.attr('id').split('-');
405
 
406
  if ( !form_parent.hasClass('activity-comments') ) {
407
  var tmp_id = form_parent.attr('id').split('-');
@@ -411,7 +411,7 @@ jq(document).ready( function() {
411
  }
412
 
413
  /* Hide any error messages */
414
- jq( 'form#' + form + ' div.error').hide();
415
  target.addClass('loading').prop('disabled', true);
416
 
417
  var ajaxdata = {
@@ -452,7 +452,7 @@ jq(document).ready( function() {
452
  form.parent().parent().addClass('has-comments');
453
  }
454
  );
455
- jq( 'form#' + form + ' textarea').val('');
456
 
457
  /* Increase the "Reply (X)" button count */
458
  jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
399
 
400
  /* Activity comment posting */
401
  if ( target.attr('name') == 'ac_form_submit' ) {
402
+ var form = target.parent().parent();
403
  var form_parent = form.parent();
404
+ var form_id = form.attr('id').split('-');
405
 
406
  if ( !form_parent.hasClass('activity-comments') ) {
407
  var tmp_id = form_parent.attr('id').split('-');
411
  }
412
 
413
  /* Hide any error messages */
414
+ jq( 'form#' + form.attr('id') + ' div.error').hide();
415
  target.addClass('loading').prop('disabled', true);
416
 
417
  var ajaxdata = {
452
  form.parent().parent().addClass('has-comments');
453
  }
454
  );
455
+ jq( 'form#' + form.attr('id') + ' textarea').val('');
456
 
457
  /* Increase the "Reply (X)" button count */
458
  jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html( Number( jq('li#activity-' + form_id[2] + ' a.acomment-reply span').html() ) + 1 );
bp-themes/bp-default/functions.php CHANGED
@@ -112,7 +112,7 @@ function bp_dtheme_setup() {
112
  add_theme_support( 'custom-header', $custom_header_args );
113
  }
114
 
115
- if ( !is_admin() ) {
116
  // Register buttons for the relevant component templates
117
  // Friends button
118
  if ( bp_is_active( 'friends' ) )
112
  add_theme_support( 'custom-header', $custom_header_args );
113
  }
114
 
115
+ if ( ! is_admin() || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
116
  // Register buttons for the relevant component templates
117
  // Friends button
118
  if ( bp_is_active( 'friends' ) )
bp-themes/bp-default/license.txt CHANGED
@@ -1,280 +1,280 @@
1
- GNU GENERAL PUBLIC LICENSE
2
- Version 2, June 1991
3
-
4
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
- 675 Mass Ave, Cambridge, MA 02139, USA
6
- Everyone is permitted to copy and distribute verbatim copies
7
- of this license document, but changing it is not allowed.
8
-
9
- Preamble
10
-
11
- The licenses for most software are designed to take away your
12
- freedom to share and change it. By contrast, the GNU General Public
13
- License is intended to guarantee your freedom to share and change free
14
- software--to make sure the software is free for all its users. This
15
- General Public License applies to most of the Free Software
16
- Foundation's software and to any other program whose authors commit to
17
- using it. (Some other Free Software Foundation software is covered by
18
- the GNU Library General Public License instead.) You can apply it to
19
- your programs, too.
20
-
21
- When we speak of free software, we are referring to freedom, not
22
- price. Our General Public Licenses are designed to make sure that you
23
- have the freedom to distribute copies of free software (and charge for
24
- this service if you wish), that you receive source code or can get it
25
- if you want it, that you can change the software or use pieces of it
26
- in new free programs; and that you know you can do these things.
27
-
28
- To protect your rights, we need to make restrictions that forbid
29
- anyone to deny you these rights or to ask you to surrender the rights.
30
- These restrictions translate to certain responsibilities for you if you
31
- distribute copies of the software, or if you modify it.
32
-
33
- For example, if you distribute copies of such a program, whether
34
- gratis or for a fee, you must give the recipients all the rights that
35
- you have. You must make sure that they, too, receive or can get the
36
- source code. And you must show them these terms so they know their
37
- rights.
38
-
39
- We protect your rights with two steps: (1) copyright the software, and
40
- (2) offer you this license which gives you legal permission to copy,
41
- distribute and/or modify the software.
42
-
43
- Also, for each author's protection and ours, we want to make certain
44
- that everyone understands that there is no warranty for this free
45
- software. If the software is modified by someone else and passed on, we
46
- want its recipients to know that what they have is not the original, so
47
- that any problems introduced by others will not reflect on the original
48
- authors' reputations.
49
-
50
- Finally, any free program is threatened constantly by software
51
- patents. We wish to avoid the danger that redistributors of a free
52
- program will individually obtain patent licenses, in effect making the
53
- program proprietary. To prevent this, we have made it clear that any
54
- patent must be licensed for everyone's free use or not licensed at all.
55
-
56
- The precise terms and conditions for copying, distribution and
57
- modification follow.
58
-
59
- GNU GENERAL PUBLIC LICENSE
60
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
-
62
- 0. This License applies to any program or other work which contains
63
- a notice placed by the copyright holder saying it may be distributed
64
- under the terms of this General Public License. The "Program", below,
65
- refers to any such program or work, and a "work based on the Program"
66
- means either the Program or any derivative work under copyright law:
67
- that is to say, a work containing the Program or a portion of it,
68
- either verbatim or with modifications and/or translated into another
69
- language. (Hereinafter, translation is included without limitation in
70
- the term "modification".) Each licensee is addressed as "you".
71
-
72
- Activities other than copying, distribution and modification are not
73
- covered by this License; they are outside its scope. The act of
74
- running the Program is not restricted, and the output from the Program
75
- is covered only if its contents constitute a work based on the
76
- Program (independent of having been made by running the Program).
77
- Whether that is true depends on what the Program does.
78
-
79
- 1. You may copy and distribute verbatim copies of the Program's
80
- source code as you receive it, in any medium, provided that you
81
- conspicuously and appropriately publish on each copy an appropriate
82
- copyright notice and disclaimer of warranty; keep intact all the
83
- notices that refer to this License and to the absence of any warranty;
84
- and give any other recipients of the Program a copy of this License
85
- along with the Program.
86
-
87
- You may charge a fee for the physical act of transferring a copy, and
88
- you may at your option offer warranty protection in exchange for a fee.
89
-
90
- 2. You may modify your copy or copies of the Program or any portion
91
- of it, thus forming a work based on the Program, and copy and
92
- distribute such modifications or work under the terms of Section 1
93
- above, provided that you also meet all of these conditions:
94
-
95
- a) You must cause the modified files to carry prominent notices
96
- stating that you changed the files and the date of any change.
97
-
98
- b) You must cause any work that you distribute or publish, that in
99
- whole or in part contains or is derived from the Program or any
100
- part thereof, to be licensed as a whole at no charge to all third
101
- parties under the terms of this License.
102
-
103
- c) If the modified program normally reads commands interactively
104
- when run, you must cause it, when started running for such
105
- interactive use in the most ordinary way, to print or display an
106
- announcement including an appropriate copyright notice and a
107
- notice that there is no warranty (or else, saying that you provide
108
- a warranty) and that users may redistribute the program under
109
- these conditions, and telling the user how to view a copy of this
110
- License. (Exception: if the Program itself is interactive but
111
- does not normally print such an announcement, your work based on
112
- the Program is not required to print an announcement.)
113
-
114
- These requirements apply to the modified work as a whole. If
115
- identifiable sections of that work are not derived from the Program,
116
- and can be reasonably considered independent and separate works in
117
- themselves, then this License, and its terms, do not apply to those
118
- sections when you distribute them as separate works. But when you
119
- distribute the same sections as part of a whole which is a work based
120
- on the Program, the distribution of the whole must be on the terms of
121
- this License, whose permissions for other licensees extend to the
122
- entire whole, and thus to each and every part regardless of who wrote it.
123
- Thus, it is not the intent of this section to claim rights or contest
124
- your rights to work written entirely by you; rather, the intent is to
125
- exercise the right to control the distribution of derivative or
126
- collective works based on the Program.
127
-
128
- In addition, mere aggregation of another work not based on the Program
129
- with the Program (or with a work based on the Program) on a volume of
130
- a storage or distribution medium does not bring the other work under
131
- the scope of this License.
132
-
133
- 3. You may copy and distribute the Program (or a work based on it,
134
- under Section 2) in object code or executable form under the terms of
135
- Sections 1 and 2 above provided that you also do one of the following:
136
-
137
- a) Accompany it with the complete corresponding machine-readable
138
- source code, which must be distributed under the terms of Sections
139
- 1 and 2 above on a medium customarily used for software interchange; or,
140
-
141
- b) Accompany it with a written offer, valid for at least three
142
- years, to give any third party, for a charge no more than your
143
- cost of physically performing source distribution, a complete
144
- machine-readable copy of the corresponding source code, to be
145
- distributed under the terms of Sections 1 and 2 above on a medium
146
- customarily used for software interchange; or,
147
-
148
- c) Accompany it with the information you received as to the offer
149
- to distribute corresponding source code. (This alternative is
150
- allowed only for noncommercial distribution and only if you
151
- received the program in object code or executable form with such
152
- an offer, in accord with Subsection b above.)
153
-
154
- The source code for a work means the preferred form of the work for
155
- making modifications to it. For an executable work, complete source
156
- code means all the source code for all modules it contains, plus any
157
- associated interface definition files, plus the scripts used to
158
- control compilation and installation of the executable. However, as a
159
- special exception, the source code distributed need not include
160
- anything that is normally distributed (in either source or binary
161
- form) with the major components (compiler, kernel, and so on) of the
162
- operating system on which the executable runs, unless that component
163
- itself accompanies the executable.
164
-
165
- If distribution of executable or object code is made by offering
166
- access to copy from a designated place, then offering equivalent
167
- access to copy the source code from the same place counts as
168
- distribution of the source code, even though third parties are not
169
- compelled to copy the source along with the object code.
170
-
171
- 4. You may not copy, modify, sublicense, or distribute the Program
172
- except as expressly provided under this License. Any attempt
173
- otherwise to copy, modify, sublicense or distribute the Program is
174
- void, and will automatically terminate your rights under this License.
175
- However, parties who have received copies, or rights, from you under
176
- this License will not have their licenses terminated so long as such
177
- parties remain in full compliance.
178
-
179
- 5. You are not required to accept this License, since you have not
180
- signed it. However, nothing else grants you permission to modify or
181
- distribute the Program or its derivative works. These actions are
182
- prohibited by law if you do not accept this License. Therefore, by
183
- modifying or distributing the Program (or any work based on the
184
- Program), you indicate your acceptance of this License to do so, and
185
- all its terms and conditions for copying, distributing or modifying
186
- the Program or works based on it.
187
-
188
- 6. Each time you redistribute the Program (or any work based on the
189
- Program), the recipient automatically receives a license from the
190
- original licensor to copy, distribute or modify the Program subject to
191
- these terms and conditions. You may not impose any further
192
- restrictions on the recipients' exercise of the rights granted herein.
193
- You are not responsible for enforcing compliance by third parties to
194
- this License.
195
-
196
- 7. If, as a consequence of a court judgment or allegation of patent
197
- infringement or for any other reason (not limited to patent issues),
198
- conditions are imposed on you (whether by court order, agreement or
199
- otherwise) that contradict the conditions of this License, they do not
200
- excuse you from the conditions of this License. If you cannot
201
- distribute so as to satisfy simultaneously your obligations under this
202
- License and any other pertinent obligations, then as a consequence you
203
- may not distribute the Program at all. For example, if a patent
204
- license would not permit royalty-free redistribution of the Program by
205
- all those who receive copies directly or indirectly through you, then
206
- the only way you could satisfy both it and this License would be to
207
- refrain entirely from distribution of the Program.
208
-
209
- If any portion of this section is held invalid or unenforceable under
210
- any particular circumstance, the balance of the section is intended to
211
- apply and the section as a whole is intended to apply in other
212
- circumstances.
213
-
214
- It is not the purpose of this section to induce you to infringe any
215
- patents or other property right claims or to contest validity of any
216
- such claims; this section has the sole purpose of protecting the
217
- integrity of the free software distribution system, which is
218
- implemented by public license practices. Many people have made
219
- generous contributions to the wide range of software distributed
220
- through that system in reliance on consistent application of that
221
- system; it is up to the author/donor to decide if he or she is willing
222
- to distribute software through any other system and a licensee cannot
223
- impose that choice.
224
-
225
- This section is intended to make thoroughly clear what is believed to
226
- be a consequence of the rest of this License.
227
-
228
- 8. If the distribution and/or use of the Program is restricted in
229
- certain countries either by patents or by copyrighted interfaces, the
230
- original copyright holder who places the Program under this License
231
- may add an explicit geographical distribution limitation excluding
232
- those countries, so that distribution is permitted only in or among
233
- countries not thus excluded. In such case, this License incorporates
234
- the limitation as if written in the body of this License.
235
-
236
- 9. The Free Software Foundation may publish revised and/or new versions
237
- of the General Public License from time to time. Such new versions will
238
- be similar in spirit to the present version, but may differ in detail to
239
- address new problems or concerns.
240
-
241
- Each version is given a distinguishing version number. If the Program
242
- specifies a version number of this License which applies to it and "any
243
- later version", you have the option of following the terms and conditions
244
- either of that version or of any later version published by the Free
245
- Software Foundation. If the Program does not specify a version number of
246
- this License, you may choose any version ever published by the Free Software
247
- Foundation.
248
-
249
- 10. If you wish to incorporate parts of the Program into other free
250
- programs whose distribution conditions are different, write to the author
251
- to ask for permission. For software which is copyrighted by the Free
252
- Software Foundation, write to the Free Software Foundation; we sometimes
253
- make exceptions for this. Our decision will be guided by the two goals
254
- of preserving the free status of all derivatives of our free software and
255
- of promoting the sharing and reuse of software generally.
256
-
257
- NO WARRANTY
258
-
259
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
260
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
261
- OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
262
- PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
263
- OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
264
- MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
265
- TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
266
- PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
267
- REPAIR OR CORRECTION.
268
-
269
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
270
- WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
271
- REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
272
- INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
273
- OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
274
- TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
275
- YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
276
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
277
- POSSIBILITY OF SUCH DAMAGES.
278
-
279
- END OF TERMS AND CONDITIONS
280
-
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
5
+ 675 Mass Ave, Cambridge, MA 02139, USA
6
+ Everyone is permitted to copy and distribute verbatim copies
7
+ of this license document, but changing it is not allowed.
8
+
9
+ Preamble
10
+
11
+ The licenses for most software are designed to take away your
12
+ freedom to share and change it. By contrast, the GNU General Public
13
+ License is intended to guarantee your freedom to share and change free
14
+ software--to make sure the software is free for all its users. This
15
+ General Public License applies to most of the Free Software
16
+ Foundation's software and to any other program whose authors commit to
17
+ using it. (Some other Free Software Foundation software is covered by
18
+ the GNU Library General Public License instead.) You can apply it to
19
+ your programs, too.
20
+
21
+ When we speak of free software, we are referring to freedom, not
22
+ price. Our General Public Licenses are designed to make sure that you
23
+ have the freedom to distribute copies of free software (and charge for
24
+ this service if you wish), that you receive source code or can get it
25
+ if you want it, that you can change the software or use pieces of it
26
+ in new free programs; and that you know you can do these things.
27
+
28
+ To protect your rights, we need to make restrictions that forbid
29
+ anyone to deny you these rights or to ask you to surrender the rights.
30
+ These restrictions translate to certain responsibilities for you if you
31
+ distribute copies of the software, or if you modify it.
32
+
33
+ For example, if you distribute copies of such a program, whether
34
+ gratis or for a fee, you must give the recipients all the rights that
35
+ you have. You must make sure that they, too, receive or can get the
36
+ source code. And you must show them these terms so they know their
37
+ rights.
38
+
39
+ We protect your rights with two steps: (1) copyright the software, and
40
+ (2) offer you this license which gives you legal permission to copy,
41
+ distribute and/or modify the software.
42
+
43
+ Also, for each author's protection and ours, we want to make certain
44
+ that everyone understands that there is no warranty for this free
45
+ software. If the software is modified by someone else and passed on, we
46
+ want its recipients to know that what they have is not the original, so
47
+ that any problems introduced by others will not reflect on the original
48
+ authors' reputations.
49
+
50
+ Finally, any free program is threatened constantly by software
51
+ patents. We wish to avoid the danger that redistributors of a free
52
+ program will individually obtain patent licenses, in effect making the
53
+ program proprietary. To prevent this, we have made it clear that any
54
+ patent must be licensed for everyone's free use or not licensed at all.
55
+
56
+ The precise terms and conditions for copying, distribution and
57
+ modification follow.
58
+
59
+ GNU GENERAL PUBLIC LICENSE
60
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
+
62
+ 0. This License applies to any program or other work which contains
63
+ a notice placed by the copyright holder saying it may be distributed
64
+ under the terms of this General Public License. The "Program", below,
65
+ refers to any such program or work, and a "work based on the Program"
66
+ means either the Program or any derivative work under copyright law:
67
+ that is to say, a work containing the Program or a portion of it,
68
+ either verbatim or with modifications and/or translated into another
69
+ language. (Hereinafter, translation is included without limitation in
70
+ the term "modification".) Each licensee is addressed as "you".
71
+
72
+ Activities other than copying, distribution and modification are not
73
+ covered by this License; they are outside its scope. The act of
74
+ running the Program is not restricted, and the output from the Program
75
+ is covered only if its contents constitute a work based on the
76
+ Program (independent of having been made by running the Program).
77
+ Whether that is true depends on what the Program does.
78
+
79
+ 1. You may copy and distribute verbatim copies of the Program's
80
+ source code as you receive it, in any medium, provided that you
81
+ conspicuously and appropriately publish on each copy an appropriate
82
+ copyright notice and disclaimer of warranty; keep intact all the
83
+ notices that refer to this License and to the absence of any warranty;
84
+ and give any other recipients of the Program a copy of this License
85
+ along with the Program.
86
+
87
+ You may charge a fee for the physical act of transferring a copy, and
88
+ you may at your option offer warranty protection in exchange for a fee.
89
+
90
+ 2. You may modify your copy or copies of the Program or any portion
91
+ of it, thus forming a work based on the Program, and copy and
92
+ distribute such modifications or work under the terms of Section 1
93
+ above, provided that you also meet all of these conditions:
94
+
95
+ a) You must cause the modified files to carry prominent notices
96
+ stating that you changed the files and the date of any change.
97
+
98
+ b) You must cause any work that you distribute or publish, that in
99
+ whole or in part contains or is derived from the Program or any
100
+ part thereof, to be licensed as a whole at no charge to all third
101
+ parties under the terms of this License.
102
+
103
+ c) If the modified program normally reads commands interactively
104
+ when run, you must cause it, when started running for such
105
+ interactive use in the most ordinary way, to print or display an
106
+ announcement including an appropriate copyright notice and a
107
+ notice that there is no warranty (or else, saying that you provide
108
+ a warranty) and that users may redistribute the program under
109
+ these conditions, and telling the user how to view a copy of this
110
+ License. (Exception: if the Program itself is interactive but
111
+ does not normally print such an announcement, your work based on
112
+ the Program is not required to print an announcement.)
113
+
114
+ These requirements apply to the modified work as a whole. If
115
+ identifiable sections of that work are not derived from the Program,
116
+ and can be reasonably considered independent and separate works in
117
+ themselves, then this License, and its terms, do not apply to those
118
+ sections when you distribute them as separate works. But when you
119
+ distribute the same sections as part of a whole which is a work based
120
+ on the Program, the distribution of the whole must be on the terms of
121
+ this License, whose permissions for other licensees extend to the
122
+ entire whole, and thus to each and every part regardless of who wrote it.
123
+ Thus, it is not the intent of this section to claim rights or contest
124
+ your rights to work written entirely by you; rather, the intent is to
125
+ exercise the right to control the distribution of derivative or
126
+ collective works based on the Program.
127
+
128
+ In addition, mere aggregation of another work not based on the Program
129
+ with the Program (or with a work based on the Program) on a volume of
130
+ a storage or distribution medium does not bring the other work under
131
+ the scope of this License.
132
+
133
+ 3. You may copy and distribute the Program (or a work based on it,
134
+ under Section 2) in object code or executable form under the terms of
135
+ Sections 1 and 2 above provided that you also do one of the following:
136
+
137
+ a) Accompany it with the complete corresponding machine-readable
138
+ source code, which must be distributed under the terms of Sections
139
+ 1 and 2 above on a medium customarily used for software interchange; or,
140
+
141
+ b) Accompany it with a written offer, valid for at least three
142
+ years, to give any third party, for a charge no more than your
143
+ cost of physically performing source distribution, a complete
144
+ machine-readable copy of the corresponding source code, to be
145
+ distributed under the terms of Sections 1 and 2 above on a medium
146
+ customarily used for software interchange; or,
147
+
148
+ c) Accompany it with the information you received as to the offer
149
+ to distribute corresponding source code. (This alternative is
150
+ allowed only for noncommercial distribution and only if you
151
+ received the program in object code or executable form with such
152
+ an offer, in accord with Subsection b above.)
153
+
154
+ The source code for a work means the preferred form of the work for
155
+ making modifications to it. For an executable work, complete source
156
+ code means all the source code for all modules it contains, plus any
157
+ associated interface definition files, plus the scripts used to
158
+ control compilation and installation of the executable. However, as a
159
+ special exception, the source code distributed need not include
160
+ anything that is normally distributed (in either source or binary
161
+ form) with the major components (compiler, kernel, and so on) of the
162
+ operating system on which the executable runs, unless that component
163
+ itself accompanies the executable.
164
+
165
+ If distribution of executable or object code is made by offering
166
+ access to copy from a designated place, then offering equivalent
167
+ access to copy the source code from the same place counts as
168
+ distribution of the source code, even though third parties are not
169
+ compelled to copy the source along with the object code.
170
+
171
+ 4. You may not copy, modify, sublicense, or distribute the Program
172
+ except as expressly provided under this License. Any attempt
173
+ otherwise to copy, modify, sublicense or distribute the Program is
174
+ void, and will automatically terminate your rights under this License.
175
+ However, parties who have received copies, or rights, from you under
176
+ this License will not have their licenses terminated so long as such
177
+ parties remain in full compliance.
178
+
179
+ 5. You are not required to accept this License, since you have not
180
+ signed it. However, nothing else grants you permission to modify or
181
+ distribute the Program or its derivative works. These actions are
182
+ prohibited by law if you do not accept this License. Therefore, by
183
+ modifying or distributing the Program (or any work based on the
184
+ Program), you indicate your acceptance of this License to do so, and
185
+ all its terms and conditions for copying, distributing or modifying
186
+ the Program or works based on it.
187
+
188
+ 6. Each time you redistribute the Program (or any work based on the
189
+ Program), the recipient automatically receives a license from the
190
+ original licensor to copy, distribute or modify the Program subject to
191
+ these terms and conditions. You may not impose any further
192
+ restrictions on the recipients' exercise of the rights granted herein.
193
+ You are not responsible for enforcing compliance by third parties to
194
+ this License.
195
+
196
+ 7. If, as a consequence of a court judgment or allegation of patent
197
+ infringement or for any other reason (not limited to patent issues),
198
+ conditions are imposed on you (whether by court order, agreement or
199
+ otherwise) that contradict the conditions of this License, they do not
200
+ excuse you from the conditions of this License. If you cannot
201
+ distribute so as to satisfy simultaneously your obligations under this
202
+ License and any other pertinent obligations, then as a consequence you
203
+ may not distribute the Program at all. For example, if a patent
204
+ license would not permit royalty-free redistribution of the Program by
205
+ all those who receive copies directly or indirectly through you, then
206
+ the only way you could satisfy both it and this License would be to
207
+ refrain entirely from distribution of the Program.
208
+
209
+ If any portion of this section is held invalid or unenforceable under
210
+ any particular circumstance, the balance of the section is intended to
211
+ apply and the section as a whole is intended to apply in other
212
+ circumstances.
213
+
214
+ It is not the purpose of this section to induce you to infringe any
215
+ patents or other property right claims or to contest validity of any
216
+ such claims; this section has the sole purpose of protecting the
217
+ integrity of the free software distribution system, which is
218
+ implemented by public license practices. Many people have made
219
+ generous contributions to the wide range of software distributed
220
+ through that system in reliance on consistent application of that
221
+ system; it is up to the author/donor to decide if he or she is willing
222
+ to distribute software through any other system and a licensee cannot
223
+ impose that choice.
224
+
225
+ This section is intended to make thoroughly clear what is believed to
226
+ be a consequence of the rest of this License.
227
+
228
+ 8. If the distribution and/or use of the Program is restricted in
229
+ certain countries either by patents or by copyrighted interfaces, the
230
+ original copyright holder who places the Program under this License
231
+ may add an explicit geographical distribution limitation excluding
232
+ those countries, so that distribution is permitted only in or among
233
+ countries not thus excluded. In such case, this License incorporates
234
+ the limitation as if written in the body of this License.
235
+
236
+ 9. The Free Software Foundation may publish revised and/or new versions
237
+ of the General Public License from time to time. Such new versions will
238
+ be similar in spirit to the present version, but may differ in detail to
239
+ address new problems or concerns.
240
+
241
+ Each version is given a distinguishing version number. If the Program
242
+ specifies a version number of this License which applies to it and "any
243
+ later version", you have the option of following the terms and conditions
244
+ either of that version or of any later version published by the Free
245
+ Software Foundation. If the Program does not specify a version number of
246
+ this License, you may choose any version ever published by the Free Software
247
+ Foundation.
248
+
249
+ 10. If you wish to incorporate parts of the Program into other free
250
+ programs whose distribution conditions are different, write to the author
251
+ to ask for permission. For software which is copyrighted by the Free
252
+ Software Foundation, write to the Free Software Foundation; we sometimes
253
+ make exceptions for this. Our decision will be guided by the two goals
254
+ of preserving the free status of all derivatives of our free software and
255
+ of promoting the sharing and reuse of software generally.
256
+
257
+ NO WARRANTY
258
+
259
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
260
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
261
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
262
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
263
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
264
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
265
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
266
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
267
+ REPAIR OR CORRECTION.
268
+
269
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
270
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
271
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
272
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
273
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
274
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
275
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
276
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
277
+ POSSIBILITY OF SUCH DAMAGES.
278
+
279
+ END OF TERMS AND CONDITIONS
280
+
bp-themes/bp-default/readme.txt CHANGED
@@ -1,22 +1,22 @@
1
- --- BuddyPress Default ---
2
- Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
3
-
4
-
5
- --- Installation ---
6
- The theme is bundled with BuddyPress. After activating the plugin, BuddyPress Default will be added to the "Appearance > Themes" menu in your WordPress admin area.
7
-
8
-
9
- --- About BuddyPress ---
10
- Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress. BuddyPress will let users register on your site and start creating profiles, posting messages, making connections, creating and interacting in groups and much more.
11
-
12
- For help with BuddyPress Default, or for more information about BuddyPress, please visit http://buddypress.org/.
13
-
14
-
15
- --- Building a BuddyPress theme ---
16
- If you want to make a custom theme based on BuddyPress Default, DO NOT copy and edit it. By doing this you will make updates and maintenance much harder for yourself. Instead, please review this codex page for instructions on how to build a BuddyPress child theme:
17
-
18
- http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
19
-
20
-
21
- --- Changelog ---
22
  A list of changes is available at http://codex.buddypress.org/theme-development/bp-default-theme-changelog/.
1
+ --- BuddyPress Default ---
2
+ Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
3
+
4
+
5
+ --- Installation ---
6
+ The theme is bundled with BuddyPress. After activating the plugin, BuddyPress Default will be added to the "Appearance > Themes" menu in your WordPress admin area.
7
+
8
+
9
+ --- About BuddyPress ---
10
+ Social networking in a box. Build a social network for your company, school, sports team or niche community all based on the power and flexibility of WordPress. BuddyPress will let users register on your site and start creating profiles, posting messages, making connections, creating and interacting in groups and much more.
11
+
12
+ For help with BuddyPress Default, or for more information about BuddyPress, please visit http://buddypress.org/.
13
+
14
+
15
+ --- Building a BuddyPress theme ---
16
+ If you want to make a custom theme based on BuddyPress Default, DO NOT copy and edit it. By doing this you will make updates and maintenance much harder for yourself. Instead, please review this codex page for instructions on how to build a BuddyPress child theme:
17
+
18
+ http://codex.buddypress.org/how-to-guides/building-a-buddypress-child-theme/
19
+
20
+
21
+ --- Changelog ---
22
  A list of changes is available at http://codex.buddypress.org/theme-development/bp-default-theme-changelog/.
bp-themes/bp-default/rtl.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6.2
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.3
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-themes/bp-default/style.css CHANGED
@@ -2,7 +2,7 @@
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
- * Version: 1.6.2
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
2
  * Theme Name: BuddyPress Default
3
  * Theme URI: http://buddypress.org/extend/themes/
4
  * Description: Clean and stylish, BuddyPress Default lets you build a social network straight out of the box. Make it yours with a custom menu, header image, and background. Along with five widgetized areas (one in the sidebar, four in the footer), BP-Default supports featured images (as custom header images on posts and pages) and is furnished with an optional one-column page template that removes the sidebar, and a stylesheet for the admin Visual Editor.
5
+ * Version: 1.6.3
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-xprofile/bp-xprofile-screens.php CHANGED
@@ -154,6 +154,9 @@ function xprofile_screen_change_avatar() {
154
  return;
155
  }
156
 
 
 
 
157
  $bp->avatar_admin->step = 'upload-image';
158
 
159
  if ( !empty( $_FILES ) ) {
154
  return;
155
  }
156
 
157
+ if ( ! isset( $bp->avatar_admin ) )
158
+ $bp->avatar_admin = new stdClass();
159
+
160
  $bp->avatar_admin->step = 'upload-image';
161
 
162
  if ( !empty( $_FILES ) ) {
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
  === Plugin Name ===
2
  Contributors: johnjamesjacoby, DJPaul, boonebgorges
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
- Requires at least: 3.4
5
- Tested up to: 3.4.1
6
- Stable tag: 1.6.2
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -86,6 +86,9 @@ BuddyPress is available in more than 20 languages. For more information, check o
86
 
87
  == Upgrade Notice ==
88
 
 
 
 
89
  = 1.6.2 =
90
  Compatibility with WordPress 3.5
91
 
1
  === Plugin Name ===
2
  Contributors: johnjamesjacoby, DJPaul, boonebgorges
3
  Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, social, community, networks, networking, cms
4
+ Requires at least: 3.5
5
+ Tested up to: 3.5
6
+ Stable tag: 1.6.3
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
86
 
87
  == Upgrade Notice ==
88
 
89
+ = 1.6.3 =
90
+ See: http://codex.buddypress.org/releases/version-1-6-3/
91
+
92
  = 1.6.2 =
93
  Compatibility with WordPress 3.5
94