BuddyPress - Version 1.8

Version Description

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

Download this release

Release Info

Developer boonebgorges
Plugin Icon 128x128 BuddyPress
Version 1.8
Comparing to
See all releases

Code changes from version 1.8-RC1 to 1.8

Files changed (19) hide show
  1. bp-activity/bp-activity-loader.php +4 -4
  2. bp-blogs/bp-blogs-loader.php +4 -4
  3. bp-core/bp-core-admin.php +1 -1
  4. bp-core/bp-core-loader.php +3 -3
  5. bp-forums/bp-forums-loader.php +4 -4
  6. bp-friends/bp-friends-loader.php +4 -4
  7. bp-groups/bp-groups-classes.php +13 -1
  8. bp-groups/bp-groups-loader.php +4 -4
  9. bp-languages/buddypress.pot +4 -4
  10. bp-loader.php +2 -2
  11. bp-members/bp-members-loader.php +3 -3
  12. bp-messages/bp-messages-loader.php +4 -4
  13. bp-templates/bp-legacy/css/buddypress.css +8 -5
  14. bp-themes/bp-default/rtl.css +1 -1
  15. bp-themes/bp-default/style.css +1 -1
  16. bp-xprofile/bp-xprofile-admin.php +7 -7
  17. bp-xprofile/bp-xprofile-classes.php +7 -7
  18. bp-xprofile/bp-xprofile-loader.php +4 -4
  19. readme.txt +10 -1
bp-activity/bp-activity-loader.php CHANGED
@@ -37,7 +37,7 @@ class BP_Activity_Component extends BP_Component {
37
  *
38
  * @since BuddyPress (1.5)
39
  */
40
- function includes() {
41
  // Files to include
42
  $includes = array(
43
  'actions',
@@ -71,7 +71,7 @@ class BP_Activity_Component extends BP_Component {
71
  *
72
  * @global object $bp BuddyPress global settings
73
  */
74
- function setup_globals() {
75
  global $bp;
76
 
77
  // Define a slug, if necessary
@@ -109,7 +109,7 @@ class BP_Activity_Component extends BP_Component {
109
  * @uses bp_get_friends_slug()
110
  * @uses bp_get_groups_slug()
111
  */
112
- function setup_nav() {
113
 
114
  $sub_nav = array();
115
 
@@ -216,7 +216,7 @@ class BP_Activity_Component extends BP_Component {
216
  * @uses bp_get_friends_slug()
217
  * @uses bp_get_groups_slug()
218
  */
219
- function setup_admin_bar() {
220
  global $bp;
221
 
222
  // Prevent debug notices
37
  *
38
  * @since BuddyPress (1.5)
39
  */
40
+ public function includes( $includes = array() ) {
41
  // Files to include
42
  $includes = array(
43
  'actions',
71
  *
72
  * @global object $bp BuddyPress global settings
73
  */
74
+ public function setup_globals( $args = array() ) {
75
  global $bp;
76
 
77
  // Define a slug, if necessary
109
  * @uses bp_get_friends_slug()
110
  * @uses bp_get_groups_slug()
111
  */
112
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
113
 
114
  $sub_nav = array();
115
 
216
  * @uses bp_get_friends_slug()
217
  * @uses bp_get_groups_slug()
218
  */
219
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
220
  global $bp;
221
 
222
  // Prevent debug notices
bp-blogs/bp-blogs-loader.php CHANGED
@@ -36,7 +36,7 @@ class BP_Blogs_Component extends BP_Component {
36
  * @since BuddyPress (1.5)
37
  * @global BuddyPress $bp The one true BuddyPress instance
38
  */
39
- function setup_globals() {
40
  global $bp;
41
 
42
  if ( !defined( 'BP_BLOGS_SLUG' ) )
@@ -67,7 +67,7 @@ class BP_Blogs_Component extends BP_Component {
67
  /**
68
  * Include files
69
  */
70
- function includes() {
71
  // Files to include
72
  $includes = array(
73
  'cache',
@@ -93,7 +93,7 @@ class BP_Blogs_Component extends BP_Component {
93
  *
94
  * @global BuddyPress $bp The one true BuddyPress instance
95
  */
96
- function setup_nav() {
97
  global $bp;
98
 
99
  /**
@@ -145,7 +145,7 @@ class BP_Blogs_Component extends BP_Component {
145
  *
146
  * @global BuddyPress $bp The one true BuddyPress instance
147
  */
148
- function setup_admin_bar() {
149
  global $bp;
150
 
151
  /**
36
  * @since BuddyPress (1.5)
37
  * @global BuddyPress $bp The one true BuddyPress instance
38
  */
39
+ public function setup_globals( $args = array() ) {
40
  global $bp;
41
 
42
  if ( !defined( 'BP_BLOGS_SLUG' ) )
67
  /**
68
  * Include files
69
  */
70
+ public function includes( $includes = array() ) {
71
  // Files to include
72
  $includes = array(
73
  'cache',
93
  *
94
  * @global BuddyPress $bp The one true BuddyPress instance
95
  */
96
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
97
  global $bp;
98
 
99
  /**
145
  *
146
  * @global BuddyPress $bp The one true BuddyPress instance
147
  */
148
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
149
  global $bp;
150
 
151
  /**
bp-core/bp-core-admin.php CHANGED
@@ -580,6 +580,7 @@ class BP_Admin {
580
  <a href="http://profiles.wordpress.org/modemlooper">modemlooper</a>,
581
  <a href="http://profiles.wordpress.org/mort3n">mort3n</a>,
582
  <a href="http://profiles.wordpress.org/mukkundthanki">mukkundthanki</a>,
 
583
  <a href="http://profiles.wordpress.org/needle">needle</a>,
584
  <a href="http://profiles.wordpress.org/r-a-y">r-a-y</a>,
585
  <a href="http://profiles.wordpress.org/saurabhshukla">saurabhshukla</a>,
@@ -590,7 +591,6 @@ class BP_Admin {
590
  <a href="http://profiles.wordpress.org/splatte">splatte</a>,
591
  <a href="http://profiles.wordpress.org/thebrandonallen">thebrandonallen</a>,
592
  <a href="http://profiles.wordpress.org/themightymo">themightymo</a>,
593
- <a href="http://profiles.wordpress.org/themightymo">themightymo</a>,
594
  <a href="http://profiles.wordpress.org/tivnet">tivnet</a>,
595
  <a href="http://profiles.wordpress.org/trishasalas">trishasalas</a>,
596
  <a href="http://profiles.wordpress.org/vegasgeek">vegasgeek</a>,
580
  <a href="http://profiles.wordpress.org/modemlooper">modemlooper</a>,
581
  <a href="http://profiles.wordpress.org/mort3n">mort3n</a>,
582
  <a href="http://profiles.wordpress.org/mukkundthanki">mukkundthanki</a>,
583
+ <a href="http://profiles.wordpress.org/nacin">nacin</a>,
584
  <a href="http://profiles.wordpress.org/needle">needle</a>,
585
  <a href="http://profiles.wordpress.org/r-a-y">r-a-y</a>,
586
  <a href="http://profiles.wordpress.org/saurabhshukla">saurabhshukla</a>,
591
  <a href="http://profiles.wordpress.org/splatte">splatte</a>,
592
  <a href="http://profiles.wordpress.org/thebrandonallen">thebrandonallen</a>,
593
  <a href="http://profiles.wordpress.org/themightymo">themightymo</a>,
 
594
  <a href="http://profiles.wordpress.org/tivnet">tivnet</a>,
595
  <a href="http://profiles.wordpress.org/trishasalas">trishasalas</a>,
596
  <a href="http://profiles.wordpress.org/vegasgeek">vegasgeek</a>,
bp-core/bp-core-loader.php CHANGED
@@ -110,7 +110,7 @@ class BP_Core extends BP_Component {
110
  $bp->required_components[] = 'core';
111
  }
112
 
113
- function includes() {
114
 
115
  if ( !is_admin() )
116
  return;
@@ -130,7 +130,7 @@ class BP_Core extends BP_Component {
130
  *
131
  * @global BuddyPress $bp
132
  */
133
- function setup_globals() {
134
  global $bp;
135
 
136
  /** Database **********************************************************/
@@ -194,7 +194,7 @@ class BP_Core extends BP_Component {
194
  *
195
  * @global BuddyPress $bp
196
  */
197
- function setup_nav() {
198
  global $bp;
199
 
200
  // If xprofile component is disabled, revert to WordPress profile
110
  $bp->required_components[] = 'core';
111
  }
112
 
113
+ public function includes( $includes = array() ) {
114
 
115
  if ( !is_admin() )
116
  return;
130
  *
131
  * @global BuddyPress $bp
132
  */
133
+ public function setup_globals( $args = array() ) {
134
  global $bp;
135
 
136
  /** Database **********************************************************/
194
  *
195
  * @global BuddyPress $bp
196
  */
197
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
198
  global $bp;
199
 
200
  // If xprofile component is disabled, revert to WordPress profile
bp-forums/bp-forums-loader.php CHANGED
@@ -35,7 +35,7 @@ class BP_Forums_Component extends BP_Component {
35
  *
36
  * @since BuddyPress (1.5)
37
  */
38
- function setup_globals() {
39
  $bp = buddypress();
40
 
41
  // Define the parent forum ID
@@ -66,7 +66,7 @@ class BP_Forums_Component extends BP_Component {
66
  /**
67
  * Include files
68
  */
69
- function includes() {
70
 
71
  // Files to include
72
  $includes = array(
@@ -94,7 +94,7 @@ class BP_Forums_Component extends BP_Component {
94
  /**
95
  * Setup BuddyBar navigation
96
  */
97
- function setup_nav() {
98
 
99
  // Stop if forums haven't been set up yet
100
  if ( !bp_forums_is_installed_correctly() )
@@ -154,7 +154,7 @@ class BP_Forums_Component extends BP_Component {
154
  /**
155
  * Set up the Toolbar
156
  */
157
- function setup_admin_bar() {
158
 
159
  // Prevent debug notices
160
  $wp_admin_nav = array();
35
  *
36
  * @since BuddyPress (1.5)
37
  */
38
+ public function setup_globals( $args = array() ) {
39
  $bp = buddypress();
40
 
41
  // Define the parent forum ID
66
  /**
67
  * Include files
68
  */
69
+ public function includes( $includes = array() ) {
70
 
71
  // Files to include
72
  $includes = array(
94
  /**
95
  * Setup BuddyBar navigation
96
  */
97
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
98
 
99
  // Stop if forums haven't been set up yet
100
  if ( !bp_forums_is_installed_correctly() )
154
  /**
155
  * Set up the Toolbar
156
  */
157
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
158
 
159
  // Prevent debug notices
160
  $wp_admin_nav = array();
bp-friends/bp-friends-loader.php CHANGED
@@ -29,7 +29,7 @@ class BP_Friends_Component extends BP_Component {
29
  /**
30
  * Include files
31
  */
32
- function includes() {
33
  // Files to include
34
  $includes = array(
35
  'actions',
@@ -54,7 +54,7 @@ class BP_Friends_Component extends BP_Component {
54
  * @since BuddyPress (1.5)
55
  * @global BuddyPress $bp The one true BuddyPress instance
56
  */
57
- function setup_globals() {
58
  global $bp;
59
 
60
  define ( 'BP_FRIENDS_DB_VERSION', '1800' );
@@ -87,7 +87,7 @@ class BP_Friends_Component extends BP_Component {
87
  *
88
  * @global BuddyPress $bp The one true BuddyPress instance
89
  */
90
- function setup_nav() {
91
  global $bp;
92
 
93
  $sub_nav = array();
@@ -142,7 +142,7 @@ class BP_Friends_Component extends BP_Component {
142
  *
143
  * @global BuddyPress $bp The one true BuddyPress instance
144
  */
145
- function setup_admin_bar() {
146
  global $bp;
147
 
148
  // Prevent debug notices
29
  /**
30
  * Include files
31
  */
32
+ public function includes( $includes = array() ) {
33
  // Files to include
34
  $includes = array(
35
  'actions',
54
  * @since BuddyPress (1.5)
55
  * @global BuddyPress $bp The one true BuddyPress instance
56
  */
57
+ public function setup_globals( $args = array() ) {
58
  global $bp;
59
 
60
  define ( 'BP_FRIENDS_DB_VERSION', '1800' );
87
  *
88
  * @global BuddyPress $bp The one true BuddyPress instance
89
  */
90
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
91
  global $bp;
92
 
93
  $sub_nav = array();
142
  *
143
  * @global BuddyPress $bp The one true BuddyPress instance
144
  */
145
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
146
  global $bp;
147
 
148
  // Prevent debug notices
bp-groups/bp-groups-classes.php CHANGED
@@ -465,6 +465,18 @@ class BP_Groups_Group {
465
  $total_sql['where'][] = $wpdb->prepare( "m.group_id = g.id AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $r['user_id'] );
466
  }
467
 
 
 
 
 
 
 
 
 
 
 
 
 
468
  // Already escaped in the paginated results block
469
  if ( ! empty( $include ) ) {
470
  $total_sql['where'][] = "g.id IN ({$include})";
@@ -1823,7 +1835,7 @@ class BP_Group_Extension {
1823
  /**
1824
  * @var bool Whether to show the nav item
1825
  */
1826
- public $enable_nav_item = false;
1827
 
1828
  /**
1829
  * @var string The text of the nav item. Defaults to self::name
465
  $total_sql['where'][] = $wpdb->prepare( "m.group_id = g.id AND m.user_id = %d AND m.is_confirmed = 1 AND m.is_banned = 0", $r['user_id'] );
466
  }
467
 
468
+ // Temporary implementation of meta_query for total count
469
+ // See #5099
470
+ if ( ! empty( $meta_query_sql['where'] ) ) {
471
+ // Join the groupmeta table
472
+ $total_sql['select'] .= ", {$bp->groups->table_name_groupmeta} gmmq";
473
+
474
+ // Modify the meta_query clause from paged_sql for our syntax
475
+ $meta_query_clause = preg_replace( '/^\s*AND/', '', $meta_query_sql['where'] );
476
+ $meta_query_clause = str_replace( $bp->groups->table_name_groupmeta, 'gmmq', $meta_query_clause );
477
+ $total_sql['where'][] = $meta_query_clause;
478
+ }
479
+
480
  // Already escaped in the paginated results block
481
  if ( ! empty( $include ) ) {
482
  $total_sql['where'][] = "g.id IN ({$include})";
1835
  /**
1836
  * @var bool Whether to show the nav item
1837
  */
1838
+ public $enable_nav_item = true;
1839
 
1840
  /**
1841
  * @var string The text of the nav item. Defaults to self::name
bp-groups/bp-groups-loader.php CHANGED
@@ -88,7 +88,7 @@ class BP_Groups_Component extends BP_Component {
88
  /**
89
  * Include files
90
  */
91
- function includes() {
92
  $includes = array(
93
  'cache',
94
  'forums',
@@ -120,7 +120,7 @@ class BP_Groups_Component extends BP_Component {
120
  * @since BuddyPress (1.5)
121
  * @global BuddyPress $bp The one true BuddyPress instance
122
  */
123
- function setup_globals() {
124
  global $bp;
125
 
126
  // Define a slug, if necessary
@@ -336,7 +336,7 @@ class BP_Groups_Component extends BP_Component {
336
  *
337
  * @global BuddyPress $bp The one true BuddyPress instance
338
  */
339
- function setup_nav() {
340
 
341
  // Define local variables
342
  $sub_nav = array();
@@ -499,7 +499,7 @@ class BP_Groups_Component extends BP_Component {
499
  *
500
  * @global BuddyPress $bp The one true BuddyPress instance
501
  */
502
- function setup_admin_bar() {
503
  global $bp;
504
 
505
  // Prevent debug notices
88
  /**
89
  * Include files
90
  */
91
+ public function includes( $includes = array() ) {
92
  $includes = array(
93
  'cache',
94
  'forums',
120
  * @since BuddyPress (1.5)
121
  * @global BuddyPress $bp The one true BuddyPress instance
122
  */
123
+ public function setup_globals( $args = array() ) {
124
  global $bp;
125
 
126
  // Define a slug, if necessary
336
  *
337
  * @global BuddyPress $bp The one true BuddyPress instance
338
  */
339
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
340
 
341
  // Define local variables
342
  $sub_nav = array();
499
  *
500
  * @global BuddyPress $bp The one true BuddyPress instance
501
  */
502
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
503
  global $bp;
504
 
505
  // Prevent debug notices
bp-languages/buddypress.pot CHANGED
@@ -4,7 +4,7 @@ msgid ""
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
- "POT-Creation-Date: 2013-07-11 01:35:17+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -3001,7 +3001,7 @@ msgstr ""
3001
  msgid "Delete Group"
3002
  msgstr ""
3003
 
3004
- #: bp-groups/bp-groups-admin.php:863 bp-groups/bp-groups-classes.php:2064
3005
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:32
3006
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:117
3007
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:58
@@ -3126,11 +3126,11 @@ msgstr ""
3126
  msgid "Group Avatar"
3127
  msgstr ""
3128
 
3129
- #: bp-groups/bp-groups-classes.php:1246
3130
  msgid "Group Mod"
3131
  msgstr ""
3132
 
3133
- #: bp-groups/bp-groups-classes.php:1252 bp-groups/bp-groups-functions.php:121
3134
  msgid "Group Admin"
3135
  msgstr ""
3136
 
4
  msgstr ""
5
  "Project-Id-Version: BuddyPress \n"
6
  "Report-Msgid-Bugs-To: http://wppolyglots.wordpress.com\n"
7
+ "POT-Creation-Date: 2013-07-16 19:35:17+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
3001
  msgid "Delete Group"
3002
  msgstr ""
3003
 
3004
+ #: bp-groups/bp-groups-admin.php:863 bp-groups/bp-groups-classes.php:2076
3005
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:32
3006
  #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:117
3007
  #: bp-templates/bp-legacy/buddypress/groups/single/forum/edit.php:58
3126
  msgid "Group Avatar"
3127
  msgstr ""
3128
 
3129
+ #: bp-groups/bp-groups-classes.php:1258
3130
  msgid "Group Mod"
3131
  msgstr ""
3132
 
3133
+ #: bp-groups/bp-groups-classes.php:1264 bp-groups/bp-groups-functions.php:121
3134
  msgid "Group Admin"
3135
  msgstr ""
3136
 
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: 1.8-RC1
20
  * Text Domain: buddypress
21
  * Domain Path: /bp-languages/
22
  * License: GPLv2 or later (license.txt)
@@ -294,7 +294,7 @@ class BuddyPress {
294
 
295
  /** Versions **********************************************************/
296
 
297
- $this->version = '1.8-RC1';
298
  $this->db_version = 6080;
299
 
300
  /** 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: 1.8
20
  * Text Domain: buddypress
21
  * Domain Path: /bp-languages/
22
  * License: GPLv2 or later (license.txt)
294
 
295
  /** Versions **********************************************************/
296
 
297
+ $this->version = '1.8';
298
  $this->db_version = 6080;
299
 
300
  /** Loading ***********************************************************/
bp-members/bp-members-loader.php CHANGED
@@ -31,7 +31,7 @@ class BP_Members_Component extends BP_Component {
31
  *
32
  * @global BuddyPress $bp The one true BuddyPress instance
33
  */
34
- function includes() {
35
  $includes = array(
36
  'actions',
37
  'filters',
@@ -54,7 +54,7 @@ class BP_Members_Component extends BP_Component {
54
  * @since BuddyPress (1.5)
55
  * @global BuddyPress $bp The one true BuddyPress instance
56
  */
57
- function setup_globals() {
58
  global $bp;
59
 
60
  // Define a slug, if necessary
@@ -143,7 +143,7 @@ class BP_Members_Component extends BP_Component {
143
  *
144
  * @global BuddyPress $bp The one true BuddyPress instance
145
  */
146
- function setup_nav() {
147
  global $bp;
148
 
149
  // Add 'Profile' to the main navigation
31
  *
32
  * @global BuddyPress $bp The one true BuddyPress instance
33
  */
34
+ public function includes( $includes = array() ) {
35
  $includes = array(
36
  'actions',
37
  'filters',
54
  * @since BuddyPress (1.5)
55
  * @global BuddyPress $bp The one true BuddyPress instance
56
  */
57
+ public function setup_globals( $args = array() ) {
58
  global $bp;
59
 
60
  // Define a slug, if necessary
143
  *
144
  * @global BuddyPress $bp The one true BuddyPress instance
145
  */
146
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
147
  global $bp;
148
 
149
  // Add 'Profile' to the main navigation
bp-messages/bp-messages-loader.php CHANGED
@@ -38,7 +38,7 @@ class BP_Messages_Component extends BP_Component {
38
  /**
39
  * Include files
40
  */
41
- function includes() {
42
  // Files to include
43
  $includes = array(
44
  'cssjs',
@@ -64,7 +64,7 @@ class BP_Messages_Component extends BP_Component {
64
  * @since BuddyPress (1.5)
65
  * @global BuddyPress $bp The one true BuddyPress instance
66
  */
67
- function setup_globals() {
68
  global $bp;
69
 
70
  // Define a slug, if necessary
@@ -98,7 +98,7 @@ class BP_Messages_Component extends BP_Component {
98
  *
99
  * @global BuddyPress $bp The one true BuddyPress instance
100
  */
101
- function setup_nav() {
102
 
103
  $sub_nav = array();
104
  $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
@@ -177,7 +177,7 @@ class BP_Messages_Component extends BP_Component {
177
  *
178
  * @global BuddyPress $bp The one true BuddyPress instance
179
  */
180
- function setup_admin_bar() {
181
  global $bp;
182
 
183
  // Prevent debug notices
38
  /**
39
  * Include files
40
  */
41
+ public function includes( $includes = array() ) {
42
  // Files to include
43
  $includes = array(
44
  'cssjs',
64
  * @since BuddyPress (1.5)
65
  * @global BuddyPress $bp The one true BuddyPress instance
66
  */
67
+ public function setup_globals( $args = array() ) {
68
  global $bp;
69
 
70
  // Define a slug, if necessary
98
  *
99
  * @global BuddyPress $bp The one true BuddyPress instance
100
  */
101
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
102
 
103
  $sub_nav = array();
104
  $name = sprintf( __( 'Messages <span>%s</span>', 'buddypress' ), bp_get_total_unread_messages_count() );
177
  *
178
  * @global BuddyPress $bp The one true BuddyPress instance
179
  */
180
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
181
  global $bp;
182
 
183
  // Prevent debug notices
bp-templates/bp-legacy/css/buddypress.css CHANGED
@@ -514,15 +514,15 @@ body.activity-permalink #buddypress div.activity-comments div.acomment-content {
514
  padding: 10px 15px;
515
  }
516
  #buddypress div#message.error p {
517
- background-color: #ffa;
518
- border: 1px solid #960;
519
  clear: left;
520
- color: #960;
521
  }
522
  #buddypress div#message.updated p {
523
  background-color: #efc;
524
  border: 1px solid #591;
525
- color: #591;
526
  }
527
  #buddypress .standard-form#signup_form div div.error {
528
  background: #faa;
@@ -1034,7 +1034,10 @@ a.bp-title-button {
1034
  font-weight: normal;
1035
  margin-top: 3px;
1036
  text-decoration: none;
1037
- background: #ffff00;
 
 
 
1038
  }
1039
  #buddypress div#item-header {
1040
  overflow: hidden;
514
  padding: 10px 15px;
515
  }
516
  #buddypress div#message.error p {
517
+ background-color: #fdc;
518
+ border: 1px solid #a00;
519
  clear: left;
520
+ color: #800;
521
  }
522
  #buddypress div#message.updated p {
523
  background-color: #efc;
524
  border: 1px solid #591;
525
+ color: #250;
526
  }
527
  #buddypress .standard-form#signup_form div div.error {
528
  background: #faa;
1034
  font-weight: normal;
1035
  margin-top: 3px;
1036
  text-decoration: none;
1037
+ background-color: #ffd;
1038
+ border: 1px solid #cb2;
1039
+ color: #440;
1040
+
1041
  }
1042
  #buddypress div#item-header {
1043
  overflow: hidden;
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.8-RC1
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.8
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.8-RC1
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.8
6
  * Author: the BuddyPress team
7
  * Author URI: http://buddypress.org
8
  * License: GNU General Public License
bp-xprofile/bp-xprofile-admin.php CHANGED
@@ -69,7 +69,7 @@ function xprofile_admin( $message = '', $type = 'error' ) {
69
 
70
  <h2>
71
  <?php _e( 'Profile Fields', 'buddypress'); ?>
72
- <a id="add_group" class="add-new-h2" href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
73
  </h2>
74
 
75
  <p><?php echo sprintf( __( 'Fields in the "%s" group will appear on the signup page.', 'buddypress' ), esc_html( stripslashes( bp_get_option( 'bp-xprofile-base-group-name' ) ) ) ) ?></p>
@@ -110,12 +110,12 @@ function xprofile_admin( $message = '', $type = 'error' ) {
110
  <div id="tabs-<?php echo $group->id; ?>" class="tab-wrapper">
111
  <div class="tab-toolbar">
112
  <div class="tab-toolbar-left">
113
- <a class="button-primary" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $group->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
114
- <a class="button edit" href="admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Edit Group', 'buddypress' ); ?></a>
115
 
116
  <?php if ( $group->can_delete ) : ?>
117
 
118
- <a class="confirm submitdelete deletion ajax-option-delete" href="admin.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Delete Group', 'buddypress' ); ?></a>
119
 
120
  <?php endif; ?>
121
 
@@ -159,7 +159,7 @@ function xprofile_admin( $message = '', $type = 'error' ) {
159
  <?php endforeach; else : ?>
160
 
161
  <div id="message" class="error"><p><?php _e( 'You have no groups.', 'buddypress' ); ?></p></div>
162
- <p><a href="admin.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a></p>
163
 
164
  <?php endif; ?>
165
 
@@ -453,11 +453,11 @@ function xprofile_admin_field( $admin_field, $admin_group, $class = '' ) {
453
  <?php endif; ?>
454
 
455
  <div class="actions">
456
- <a class="button edit" href="admin.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
457
 
458
  <?php if ( $field->can_delete ) : ?>
459
 
460
- <a class="confirm submit-delete deletion" href="admin.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
461
 
462
  <?php endif; ?>
463
  </div>
69
 
70
  <h2>
71
  <?php _e( 'Profile Fields', 'buddypress'); ?>
72
+ <a id="add_group" class="add-new-h2" href="users.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Field Group', 'buddypress' ); ?></a>
73
  </h2>
74
 
75
  <p><?php echo sprintf( __( 'Fields in the "%s" group will appear on the signup page.', 'buddypress' ), esc_html( stripslashes( bp_get_option( 'bp-xprofile-base-group-name' ) ) ) ) ?></p>
110
  <div id="tabs-<?php echo $group->id; ?>" class="tab-wrapper">
111
  <div class="tab-toolbar">
112
  <div class="tab-toolbar-left">
113
+ <a class="button-primary" href="users.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $group->id ); ?>&amp;mode=add_field"><?php _e( 'Add New Field', 'buddypress' ); ?></a>
114
+ <a class="button edit" href="users.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Edit Group', 'buddypress' ); ?></a>
115
 
116
  <?php if ( $group->can_delete ) : ?>
117
 
118
+ <a class="confirm submitdelete deletion ajax-option-delete" href="users.php?page=bp-profile-setup&amp;mode=delete_group&amp;group_id=<?php echo esc_attr( $group->id ); ?>"><?php _e( 'Delete Group', 'buddypress' ); ?></a>
119
 
120
  <?php endif; ?>
121
 
159
  <?php endforeach; else : ?>
160
 
161
  <div id="message" class="error"><p><?php _e( 'You have no groups.', 'buddypress' ); ?></p></div>
162
+ <p><a href="users.php?page=bp-profile-setup&amp;mode=add_group"><?php _e( 'Add New Group', 'buddypress' ); ?></a></p>
163
 
164
  <?php endif; ?>
165
 
453
  <?php endif; ?>
454
 
455
  <div class="actions">
456
+ <a class="button edit" href="users.php?page=bp-profile-setup&amp;group_id=<?php echo esc_attr( $admin_group->id ); ?>&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=edit_field"><?php _e( 'Edit', 'buddypress' ); ?></a>
457
 
458
  <?php if ( $field->can_delete ) : ?>
459
 
460
+ <a class="confirm submit-delete deletion" href="users.php?page=bp-profile-setup&amp;field_id=<?php echo esc_attr( $field->id ); ?>&amp;mode=delete_field"><?php _e( 'Delete', 'buddypress' ); ?></a>
461
 
462
  <?php endif; ?>
463
  </div>
bp-xprofile/bp-xprofile-classes.php CHANGED
@@ -352,11 +352,11 @@ class BP_XProfile_Group {
352
 
353
  if ( empty( $this->id ) ) {
354
  $title = __( 'Add New Field Group', 'buddypress' );
355
- $action = "admin.php?page=bp-profile-setup&amp;mode=add_group";
356
  $button = __( 'Create Field Group', 'buddypress' );
357
  } else {
358
  $title = __( 'Edit Field Group', 'buddypress' );
359
- $action = "admin.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
360
  $button = __( 'Save Changes', 'buddypress' );
361
  } ?>
362
 
@@ -403,7 +403,7 @@ class BP_XProfile_Group {
403
  <div id="submitcomment" class="submitbox">
404
  <div id="major-publishing-actions">
405
  <div id="delete-action">
406
- <a href="admin.php?page=bp-profile-setup" class="submitdelete deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
407
  </div>
408
  <div id="publishing-action">
409
  <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
@@ -784,7 +784,7 @@ class BP_XProfile_Field {
784
  <input type="text" name="<?php echo esc_attr( $type ); ?>_option[<?php echo esc_attr( $j ); ?>]" id="<?php echo esc_attr( $type ); ?>_option<?php echo esc_attr( $j ); ?>" value="<?php echo stripslashes( esc_attr( $options[$i]->name ) ); ?>" />
785
  <input type="<?php echo $default_input; ?>" name="isDefault_<?php echo esc_attr( $type ); ?>_option<?php echo esc_attr( $default_name ); ?>" <?php checked( (int) $options[$i]->is_default_option, true ); ?> value="<?php echo esc_attr( $j ); ?>" />
786
  <span><?php _e( 'Default Value', 'buddypress' ); ?></span>
787
- <a href="<?php echo esc_url( 'admin.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=' . $options[$i]->id ); ?>" class="ajax-option-delete" id="delete-<?php echo esc_attr( $options[$i]->id ); ?>">[x]</a>
788
  </p>
789
 
790
  <?php } /* end for */ ?>
@@ -816,7 +816,7 @@ class BP_XProfile_Field {
816
  function render_admin_form( $message = '' ) {
817
  if ( empty( $this->id ) ) {
818
  $title = __( 'Add Field', 'buddypress' );
819
- $action = "admin.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
820
 
821
  if ( !empty( $_POST['saveField'] ) ) {
822
  $this->name = $_POST['title'];
@@ -828,7 +828,7 @@ class BP_XProfile_Field {
828
  }
829
  } else {
830
  $title = __( 'Edit Field', 'buddypress' );
831
- $action = "admin.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id . "#tabs-" . $this->group_id;
832
  } ?>
833
 
834
  <div class="wrap">
@@ -925,7 +925,7 @@ class BP_XProfile_Field {
925
  <p class="submit">
926
  <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
927
  <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
928
- <?php _e( 'or', 'buddypress' ); ?> <a href="admin.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
929
  </p>
930
 
931
  </div>
352
 
353
  if ( empty( $this->id ) ) {
354
  $title = __( 'Add New Field Group', 'buddypress' );
355
+ $action = "users.php?page=bp-profile-setup&amp;mode=add_group";
356
  $button = __( 'Create Field Group', 'buddypress' );
357
  } else {
358
  $title = __( 'Edit Field Group', 'buddypress' );
359
+ $action = "users.php?page=bp-profile-setup&amp;mode=edit_group&amp;group_id=" . $this->id;
360
  $button = __( 'Save Changes', 'buddypress' );
361
  } ?>
362
 
403
  <div id="submitcomment" class="submitbox">
404
  <div id="major-publishing-actions">
405
  <div id="delete-action">
406
+ <a href="users.php?page=bp-profile-setup" class="submitdelete deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
407
  </div>
408
  <div id="publishing-action">
409
  <input type="submit" name="save_group" value="<?php echo esc_attr( $button ); ?>" class="button-primary"/>
784
  <input type="text" name="<?php echo esc_attr( $type ); ?>_option[<?php echo esc_attr( $j ); ?>]" id="<?php echo esc_attr( $type ); ?>_option<?php echo esc_attr( $j ); ?>" value="<?php echo stripslashes( esc_attr( $options[$i]->name ) ); ?>" />
785
  <input type="<?php echo $default_input; ?>" name="isDefault_<?php echo esc_attr( $type ); ?>_option<?php echo esc_attr( $default_name ); ?>" <?php checked( (int) $options[$i]->is_default_option, true ); ?> value="<?php echo esc_attr( $j ); ?>" />
786
  <span><?php _e( 'Default Value', 'buddypress' ); ?></span>
787
+ <a href="<?php echo esc_url( 'users.php?page=bp-profile-setup&amp;mode=delete_option&amp;option_id=' . $options[$i]->id ); ?>" class="ajax-option-delete" id="delete-<?php echo esc_attr( $options[$i]->id ); ?>">[x]</a>
788
  </p>
789
 
790
  <?php } /* end for */ ?>
816
  function render_admin_form( $message = '' ) {
817
  if ( empty( $this->id ) ) {
818
  $title = __( 'Add Field', 'buddypress' );
819
+ $action = "users.php?page=bp-profile-setup&amp;group_id=" . $this->group_id . "&amp;mode=add_field#tabs-" . $this->group_id;
820
 
821
  if ( !empty( $_POST['saveField'] ) ) {
822
  $this->name = $_POST['title'];
828
  }
829
  } else {
830
  $title = __( 'Edit Field', 'buddypress' );
831
+ $action = "users.php?page=bp-profile-setup&amp;mode=edit_field&amp;group_id=" . $this->group_id . "&amp;field_id=" . $this->id . "#tabs-" . $this->group_id;
832
  } ?>
833
 
834
  <div class="wrap">
925
  <p class="submit">
926
  <input type="hidden" name="field_order" id="field_order" value="<?php echo esc_attr( $this->field_order ); ?>" />
927
  <input type="submit" value="<?php _e( 'Save', 'buddypress' ); ?>" name="saveField" id="saveField" style="font-weight: bold" class="button-primary" />
928
+ <?php _e( 'or', 'buddypress' ); ?> <a href="users.php?page=bp-profile-setup" class="deletion"><?php _e( 'Cancel', 'buddypress' ); ?></a>
929
  </p>
930
 
931
  </div>
bp-xprofile/bp-xprofile-loader.php CHANGED
@@ -46,7 +46,7 @@ class BP_XProfile_Component extends BP_Component {
46
  /**
47
  * Include files
48
  */
49
- function includes() {
50
  $includes = array(
51
  'cssjs',
52
  'cache',
@@ -76,7 +76,7 @@ class BP_XProfile_Component extends BP_Component {
76
  * @since BuddyPress (1.5)
77
  * @global BuddyPress $bp The one true BuddyPress instance
78
  */
79
- function setup_globals() {
80
  global $bp;
81
 
82
  // Define a slug, if necessary
@@ -145,7 +145,7 @@ class BP_XProfile_Component extends BP_Component {
145
  *
146
  * @global BuddyPress $bp The one true BuddyPress instance
147
  */
148
- function setup_nav() {
149
 
150
  $sub_nav = array();
151
 
@@ -210,7 +210,7 @@ class BP_XProfile_Component extends BP_Component {
210
  *
211
  * @global BuddyPress $bp The one true BuddyPress instance
212
  */
213
- function setup_admin_bar() {
214
  global $bp;
215
 
216
  // Prevent debug notices
46
  /**
47
  * Include files
48
  */
49
+ public function includes( $includes = array() ) {
50
  $includes = array(
51
  'cssjs',
52
  'cache',
76
  * @since BuddyPress (1.5)
77
  * @global BuddyPress $bp The one true BuddyPress instance
78
  */
79
+ public function setup_globals( $args = array() ) {
80
  global $bp;
81
 
82
  // Define a slug, if necessary
145
  *
146
  * @global BuddyPress $bp The one true BuddyPress instance
147
  */
148
+ public function setup_nav( $main_nav = array(), $sub_nav = array() ) {
149
 
150
  $sub_nav = array();
151
 
210
  *
211
  * @global BuddyPress $bp The one true BuddyPress instance
212
  */
213
+ public function setup_admin_bar( $wp_admin_nav = array() ) {
214
  global $bp;
215
 
216
  // Prevent debug notices
readme.txt CHANGED
@@ -3,7 +3,7 @@ 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.5
5
  Tested up to: 3.6
6
- Stable tag: 1.7.3
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -77,6 +77,12 @@ BuddyPress is available in more than 20 languages. For more information, check o
77
 
78
  == Upgrade Notice ==
79
 
 
 
 
 
 
 
80
  = 1.7.2 =
81
  See: http://codex.buddypress.org/releases/version-1-7-2/
82
 
@@ -118,6 +124,9 @@ Fixes over 10 bugs.
118
 
119
  == Changelog ==
120
 
 
 
 
121
  = 1.7 =
122
  See: http://codex.buddypress.org/releases/version-1-7/
123
 
3
  Tags: social networking, activity, profiles, messaging, friends, groups, forums, notifications, settings, twitter, facebook, social, community, networks, networking, cms
4
  Requires at least: 3.5
5
  Tested up to: 3.6
6
+ Stable tag: 1.8
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
77
 
78
  == Upgrade Notice ==
79
 
80
+ = 1.8 =
81
+ See: http://codex.buddypress.org/releases/version-1-8/
82
+
83
+ = 1.7.3 =
84
+ See: http://codex.buddypress.org/releases/version-1-7-3/
85
+
86
  = 1.7.2 =
87
  See: http://codex.buddypress.org/releases/version-1-7-2/
88
 
124
 
125
  == Changelog ==
126
 
127
+ = 1.8 =
128
+ See: http://codex.buddypress.org/releases/version-1-8/
129
+
130
  = 1.7 =
131
  See: http://codex.buddypress.org/releases/version-1-7/
132