BuddyPress - Version 2.0

Version Description

See: http://codex.buddypress.org/releases/version-2-0/

Download this release

Release Info

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

Code changes from version 2.0-RC1 to 2.0

Files changed (12) hide show
  1. bp-activity/bp-activity-loader.php +8 -8
  2. bp-core/admin/bp-core-functions.php +2 -2
  3. bp-core/bp-core-admin.php +10 -1
  4. bp-core/bp-core-template.php +1 -1
  5. bp-languages/buddypress.pot +2 -2
  6. bp-loader.php +2 -2
  7. bp-members/admin/bp-members-classes.php +4 -4
  8. bp-members/bp-members-admin.php +3 -3
  9. bp-members/bp-members-functions.php +1 -1
  10. bp-xprofile/bp-xprofile-loader.php +34 -14
  11. humans.txt +8 -8
  12. readme.txt +5 -2
bp-activity/bp-activity-loader.php CHANGED
@@ -269,6 +269,14 @@ class BP_Activity_Component extends BP_Component {
269
  'href' => trailingslashit( $activity_link )
270
  );
271
 
 
 
 
 
 
 
 
 
272
  // Mentions
273
  if ( bp_activity_do_mentions() ) {
274
  $wp_admin_nav[] = array(
@@ -279,14 +287,6 @@ class BP_Activity_Component extends BP_Component {
279
  );
280
  }
281
 
282
- // Personal
283
- $wp_admin_nav[] = array(
284
- 'parent' => 'my-account-' . $this->id,
285
- 'id' => 'my-account-' . $this->id . '-personal',
286
- 'title' => __( 'Personal', 'buddypress' ),
287
- 'href' => trailingslashit( $activity_link )
288
- );
289
-
290
  // Favorites
291
  $wp_admin_nav[] = array(
292
  'parent' => 'my-account-' . $this->id,
269
  'href' => trailingslashit( $activity_link )
270
  );
271
 
272
+ // Personal
273
+ $wp_admin_nav[] = array(
274
+ 'parent' => 'my-account-' . $this->id,
275
+ 'id' => 'my-account-' . $this->id . '-personal',
276
+ 'title' => __( 'Personal', 'buddypress' ),
277
+ 'href' => trailingslashit( $activity_link )
278
+ );
279
+
280
  // Mentions
281
  if ( bp_activity_do_mentions() ) {
282
  $wp_admin_nav[] = array(
287
  );
288
  }
289
 
 
 
 
 
 
 
 
 
290
  // Favorites
291
  $wp_admin_nav[] = array(
292
  'parent' => 'my-account-' . $this->id,
bp-core/admin/bp-core-functions.php CHANGED
@@ -842,9 +842,9 @@ function bp_core_admin_user_row_actions( $actions, $user_object ) {
842
  $url = bp_get_admin_url( 'users.php' );
843
 
844
  if ( bp_is_user_spammer( $user_object->ID ) ) {
845
- $actions['ham'] = "<a href='" . wp_nonce_url( $url . "?action=ham&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Not Spam' ) . "</a>";
846
  } else {
847
- $actions['spam'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "?action=spam&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Mark as Spam' ) . "</a>";
848
  }
849
  }
850
 
842
  $url = bp_get_admin_url( 'users.php' );
843
 
844
  if ( bp_is_user_spammer( $user_object->ID ) ) {
845
+ $actions['ham'] = "<a href='" . wp_nonce_url( $url . "?action=ham&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Not Spam', 'buddypress' ) . "</a>";
846
  } else {
847
+ $actions['spam'] = "<a class='submitdelete' href='" . wp_nonce_url( $url . "?action=spam&amp;user=$user_object->ID", 'bp-spam-user' ) . "'>" . __( 'Mark as Spam', 'buddypress' ) . "</a>";
848
  }
849
  }
850
 
bp-core/bp-core-admin.php CHANGED
@@ -639,11 +639,19 @@ class BP_Admin {
639
  */
640
  public function credits_screen() {
641
 
 
 
642
  list( $display_version ) = explode( '-', bp_get_version() ); ?>
643
 
644
  <div class="wrap about-wrap">
645
  <h1><?php printf( __( 'Welcome to BuddyPress %s', 'buddypress' ), $display_version ); ?></h1>
646
- <div class="about-text"><?php printf( __( '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.', 'buddypress' ), $display_version ); ?></div>
 
 
 
 
 
 
647
  <div class="bp-badge"></div>
648
 
649
  <h2 class="nav-tab-wrapper">
@@ -747,6 +755,7 @@ class BP_Admin {
747
  <a href="https://profiles.wordpress.org/SlothLoveChunk/">SlothLoveChunk</a>,
748
  <a href="https://profiles.wordpress.org/StijnDeWitt/">StijnDeWitt</a>,
749
  <a href="https://profiles.wordpress.org/terraling/">terraling</a>,
 
750
  <a href="https://profiles.wordpress.org/tw2113/">tw2113</a>,
751
  <a href="https://profiles.wordpress.org/vanillalounge/">vanillalounge</a>.
752
  </p>
639
  */
640
  public function credits_screen() {
641
 
642
+ $is_new_install = ! empty( $_GET['is_new_install'] );
643
+
644
  list( $display_version ) = explode( '-', bp_get_version() ); ?>
645
 
646
  <div class="wrap about-wrap">
647
  <h1><?php printf( __( 'Welcome to BuddyPress %s', 'buddypress' ), $display_version ); ?></h1>
648
+ <div class="about-text">
649
+ <?php if ( $is_new_install ) : ?>
650
+ <?php printf( __( 'It&#8217;s a great time to use BuddyPress! With a focus on speed, admin tools, and developer enhancements, %s is our leanest and most powerful version yet.', 'buddypress' ), $display_version ); ?>
651
+ <?php else : ?>
652
+ <?php printf( __( 'Thanks for updating! With a focus on speed, admin tools, and developer enhancements, BuddyPress %s is our leanest and most powerful version yet.', 'buddypress' ), $display_version ); ?>
653
+ <?php endif; ?>
654
+ </div>
655
  <div class="bp-badge"></div>
656
 
657
  <h2 class="nav-tab-wrapper">
755
  <a href="https://profiles.wordpress.org/SlothLoveChunk/">SlothLoveChunk</a>,
756
  <a href="https://profiles.wordpress.org/StijnDeWitt/">StijnDeWitt</a>,
757
  <a href="https://profiles.wordpress.org/terraling/">terraling</a>,
758
+ <a href="https://profiles.wordpress.org/trishasalas/">trishasalas</a>,
759
  <a href="https://profiles.wordpress.org/tw2113/">tw2113</a>,
760
  <a href="https://profiles.wordpress.org/vanillalounge/">vanillalounge</a>.
761
  </p>
bp-core/bp-core-template.php CHANGED
@@ -97,7 +97,7 @@ function bp_get_directory_title( $component = '' ) {
97
  $title = '';
98
 
99
  // Use the string provided by the component
100
- if ( isset( buddypress()->{$component}->directory_title ) ) {
101
  $title = buddypress()->{$component}->directory_title;
102
 
103
  // If none is found, concatenate
97
  $title = '';
98
 
99
  // Use the string provided by the component
100
+ if ( ! empty( buddypress()->{$component}->directory_title ) ) {
101
  $title = buddypress()->{$component}->directory_title;
102
 
103
  // If none is found, concatenate
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-04-13 19:30:36+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -1828,7 +1828,7 @@ msgstr ""
1828
  msgid "<a href=\"%s\">&hellip;and lots more!</a>"
1829
  msgstr ""
1830
 
1831
- #: bp-core/bp-core-admin.php:623 bp-core/bp-core-admin.php:756
1832
  msgid "Go to the BuddyPress Settings page"
1833
  msgstr ""
1834
 
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2014-04-15 14:30:37+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
1828
  msgid "<a href=\"%s\">&hellip;and lots more!</a>"
1829
  msgstr ""
1830
 
1831
+ #: bp-core/bp-core-admin.php:623 bp-core/bp-core-admin.php:757
1832
  msgid "Go to the BuddyPress Settings page"
1833
  msgstr ""
1834
 
bp-loader.php CHANGED
@@ -16,7 +16,7 @@
16
  * 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.
17
  * Author: The BuddyPress Community
18
  * Author URI: http://buddypress.org/community/members/
19
- * Version: 2.0-RC1
20
  * Text Domain: buddypress
21
  * Domain Path: /bp-languages/
22
  * License: GPLv2 or later (license.txt)
@@ -303,7 +303,7 @@ class BuddyPress {
303
 
304
  /** Versions **************************************************/
305
 
306
- $this->version = '2.0-RC1';
307
  $this->db_version = 7892;
308
 
309
  /** Loading ***************************************************/
16
  * 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.
17
  * Author: The BuddyPress Community
18
  * Author URI: http://buddypress.org/community/members/
19
+ * Version: 2.0
20
  * Text Domain: buddypress
21
  * Domain Path: /bp-languages/
22
  * License: GPLv2 or later (license.txt)
303
 
304
  /** Versions **************************************************/
305
 
306
+ $this->version = '2.0';
307
  $this->db_version = 7892;
308
 
309
  /** Loading ***************************************************/
bp-members/admin/bp-members-classes.php CHANGED
@@ -145,7 +145,7 @@ class BP_Members_List_Table extends WP_Users_List_Table {
145
  );
146
 
147
  if ( current_user_can( 'delete_users' ) ) {
148
- $actions['delete'] = __( 'Delete' );
149
  }
150
 
151
  return $actions;
@@ -223,7 +223,7 @@ class BP_Members_List_Table extends WP_Users_List_Table {
223
  */
224
  public function column_cb( $signup_object = null ) {
225
  ?>
226
- <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php echo esc_html( sprintf( __( 'Select %s' ), $signup_object->user_login ) ); ?></label>
227
  <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
228
  <?php
229
  }
@@ -463,7 +463,7 @@ class BP_Members_MS_List_Table extends WP_MS_Users_List_Table {
463
  );
464
 
465
  if ( current_user_can( 'delete_users' ) ) {
466
- $actions['delete'] = __( 'Delete' );
467
  }
468
 
469
  return $actions;
@@ -536,7 +536,7 @@ class BP_Members_MS_List_Table extends WP_MS_Users_List_Table {
536
  */
537
  public function column_cb( $signup_object = null ) {
538
  ?>
539
- <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php echo esc_html( sprintf( __( 'Select %s' ), $signup_object->user_login ) ); ?></label>
540
  <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
541
  <?php
542
  }
145
  );
146
 
147
  if ( current_user_can( 'delete_users' ) ) {
148
+ $actions['delete'] = __( 'Delete', 'buddypress' );
149
  }
150
 
151
  return $actions;
223
  */
224
  public function column_cb( $signup_object = null ) {
225
  ?>
226
+ <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php echo esc_html( sprintf( __( 'Select %s', 'buddypress' ), $signup_object->user_login ) ); ?></label>
227
  <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
228
  <?php
229
  }
463
  );
464
 
465
  if ( current_user_can( 'delete_users' ) ) {
466
+ $actions['delete'] = __( 'Delete', 'buddypress' );
467
  }
468
 
469
  return $actions;
536
  */
537
  public function column_cb( $signup_object = null ) {
538
  ?>
539
+ <label class="screen-reader-text" for="signup_<?php echo intval( $signup_object->id ); ?>"><?php echo esc_html( sprintf( __( 'Select %s', 'buddypress' ), $signup_object->user_login ) ); ?></label>
540
  <input type="checkbox" id="signup_<?php echo intval( $signup_object->id ) ?>" name="allsignups[]" value="<?php echo esc_attr( $signup_object->id ) ?>" />
541
  <?php
542
  }
bp-members/bp-members-admin.php CHANGED
@@ -1291,13 +1291,13 @@ class BP_Members_Admin {
1291
  <?php
1292
  _e( 'Users', 'buddypress' );
1293
  if ( current_user_can( 'create_users' ) ) { ?>
1294
- <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
1295
  <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
1296
- <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
1297
  <?php }
1298
 
1299
  if ( $usersearch ) {
1300
- printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $usersearch ) );
1301
  }
1302
 
1303
  ?>
1291
  <?php
1292
  _e( 'Users', 'buddypress' );
1293
  if ( current_user_can( 'create_users' ) ) { ?>
1294
+ <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user', 'buddypress' ); ?></a>
1295
  <?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
1296
+ <a href="user-new.php" class="add-new-h2"><?php echo esc_html_x( 'Add Existing', 'user', 'buddypress' ); ?></a>
1297
  <?php }
1298
 
1299
  if ( $usersearch ) {
1300
+ printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;', 'buddypress' ) . '</span>', esc_html( $usersearch ) );
1301
  }
1302
 
1303
  ?>
bp-members/bp-members-functions.php CHANGED
@@ -1584,7 +1584,7 @@ function bp_core_activate_signup( $key ) {
1584
  BP_Signup::validate( $key );
1585
 
1586
  if ( isset( $user_already_exists ) ) {
1587
- return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup );
1588
  }
1589
 
1590
  // Set up data to pass to the legacy filter
1584
  BP_Signup::validate( $key );
1585
 
1586
  if ( isset( $user_already_exists ) ) {
1587
+ return new WP_Error( 'user_already_exists', __( 'That username is already activated.', 'buddypress' ), $signup );
1588
  }
1589
 
1590
  // Set up data to pass to the legacy filter
bp-xprofile/bp-xprofile-loader.php CHANGED
@@ -44,6 +44,8 @@ class BP_XProfile_Component extends BP_Component {
44
  'adminbar_myaccount_order' => 20
45
  )
46
  );
 
 
47
  }
48
 
49
  /**
@@ -282,25 +284,20 @@ class BP_XProfile_Component extends BP_Component {
282
  );
283
  }
284
 
285
- // Privacy Settings
286
- if ( bp_is_active( 'settings' ) ) {
287
-
288
- // Setup the logged in user variables
289
- $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
290
-
291
- // Add main Settings menu
292
- $wp_admin_nav[] = array(
293
- 'parent' => 'my-account-' . $bp->settings->id,
294
- 'id' => 'my-account-' . $bp->settings->id . '-profile',
295
- 'title' => __( 'Profile', 'buddypress' ),
296
- 'href' => trailingslashit( $settings_link . 'profile' )
297
- );
298
- }
299
  }
300
 
301
  parent::setup_admin_bar( $wp_admin_nav );
302
  }
303
 
 
 
 
 
 
 
 
 
 
304
  /**
305
  * Sets up the title for pages and <title>
306
  */
@@ -322,6 +319,29 @@ class BP_XProfile_Component extends BP_Component {
322
 
323
  parent::setup_title();
324
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
325
  }
326
 
327
  function bp_setup_xprofile() {
44
  'adminbar_myaccount_order' => 20
45
  )
46
  );
47
+
48
+ $this->setup_hooks();
49
  }
50
 
51
  /**
284
  );
285
  }
286
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
287
  }
288
 
289
  parent::setup_admin_bar( $wp_admin_nav );
290
  }
291
 
292
+ /**
293
+ * Add custom hooks.
294
+ *
295
+ * @since BuddyPress (2.0.0)
296
+ */
297
+ public function setup_hooks() {
298
+ add_filter( 'bp_settings_admin_nav', array( $this, 'setup_settings_admin_nav' ), 2 );
299
+ }
300
+
301
  /**
302
  * Sets up the title for pages and <title>
303
  */
319
 
320
  parent::setup_title();
321
  }
322
+
323
+ /**
324
+ * Adds "Settings > Profile" subnav item under the "Settings" adminbar menu.
325
+ *
326
+ * @since BuddyPress (2.0.0)
327
+ *
328
+ * @param array $wp_admin_nav The settings adminbar nav array.
329
+ * @return array
330
+ */
331
+ public function setup_settings_admin_nav( $wp_admin_nav ) {
332
+ // Setup the logged in user variables
333
+ $settings_link = trailingslashit( bp_loggedin_user_domain() . bp_get_settings_slug() );
334
+
335
+ // Add the "Profile" subnav item
336
+ $wp_admin_nav[] = array(
337
+ 'parent' => 'my-account-' . buddypress()->settings->id,
338
+ 'id' => 'my-account-' . buddypress()->settings->id . '-profile',
339
+ 'title' => __( 'Profile', 'buddypress' ),
340
+ 'href' => trailingslashit( $settings_link . 'profile' )
341
+ );
342
+
343
+ return $wp_admin_nav;
344
+ }
345
  }
346
 
347
  function bp_setup_xprofile() {
humans.txt CHANGED
@@ -51,19 +51,19 @@ Title: Core Developer
51
  Twitter: r-a-y
52
  Favourite Food: tbd
53
 
54
- Name: Mercime
55
- Title: Navigator
56
- Twitter: mercime_one
57
- Favorite Food: Paella Valenciana
58
-
59
  Name: Mathieu Viet
60
  Title: Core Developer
61
  Twitter: imath
62
  Favorite Food: Spaghetti Bolognese
63
 
 
 
 
 
 
64
  /* THANKS */
65
- hnla, mercime, modemlooper, cnorris23, karmatosed, photomatt
66
 
67
  /* META */
68
- Updated: 2014/04/05
69
- See: http://humanstxt.org/
51
  Twitter: r-a-y
52
  Favourite Food: tbd
53
 
 
 
 
 
 
54
  Name: Mathieu Viet
55
  Title: Core Developer
56
  Twitter: imath
57
  Favorite Food: Spaghetti Bolognese
58
 
59
+ Name: Mercime
60
+ Title: Navigator
61
+ Twitter: mercime_one
62
+ Favorite Food: Paella Valenciana
63
+
64
  /* THANKS */
65
+ hnla, modemlooper, cnorris23, karmatosed, photomatt
66
 
67
  /* META */
68
+ Updated: 2014/04/14
69
+ See: http://humanstxt.org/
readme.txt CHANGED
@@ -2,8 +2,8 @@
2
  Contributors: johnjamesjacoby, DJPaul, boonebgorges, r-a-y
3
  Tags: social networking, activity, profiles, messaging, friends, groups, forums, notifications, settings, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.6
5
- Tested up to: 3.8.1
6
- Stable tag: 1.9.2
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -77,6 +77,9 @@ BuddyPress is available in more than 20 languages. For more information, check o
77
 
78
  == Upgrade Notice ==
79
 
 
 
 
80
  = 1.9.2 =
81
  See: http://codex.buddypress.org/releases/version-1-9-2/
82
 
2
  Contributors: johnjamesjacoby, DJPaul, boonebgorges, r-a-y
3
  Tags: social networking, activity, profiles, messaging, friends, groups, forums, notifications, settings, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.6
5
+ Tested up to: 3.9
6
+ Stable tag: 2.0
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
77
 
78
  == Upgrade Notice ==
79
 
80
+ = 2.0 =
81
+ See: http://codex.buddypress.org/releases/version-2-0/
82
+
83
  = 1.9.2 =
84
  See: http://codex.buddypress.org/releases/version-1-9-2/
85