BuddyPress - Version 1.2.5.1

Version Description

Fixes 'Mark user as spam' and 'Delete user' issues. Important upgrade.

=

Download this release

Release Info

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

Code changes from version 1.2.5 to 1.2.5.1

bp-activity/bp-activity-classes.php CHANGED
@@ -525,7 +525,7 @@ Class BP_Activity_Activity {
525
function get_last_updated() {
526
global $bp, $wpdb;
527
528
- return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded ASC LIMIT 1" ) );
529
}
530
531
function total_favorite_count( $user_id ) {
525
function get_last_updated() {
526
global $bp, $wpdb;
527
528
+ return $wpdb->get_var( $wpdb->prepare( "SELECT date_recorded FROM {$bp->activity->table_name} ORDER BY date_recorded DESC LIMIT 1" ) );
529
}
530
531
function total_favorite_count( $user_id ) {
bp-blogs.php CHANGED
@@ -472,21 +472,24 @@ function bp_blogs_record_comment( $comment_id, $is_approved = true ) {
472
// If blog is public allow activity to be posted
473
if ( get_blog_option( $blog_id, 'blog_public' ) ) {
474
475
// Prepare to record in activity streams
476
- $comment_link = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
477
- $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $comment_link . '">' . $recorded_comment->post->post_title . '</a>' );
478
- $activity_content = $recorded_comment->comment_content;
479
480
// Record in activity streams
481
bp_blogs_record_activity( array(
482
- 'user_id' => $user_id,
483
- 'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$recorded_comment, $comment_link ),
484
- 'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$recorded_comment, $comment_link ),
485
- 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$recorded_comment ),
486
- 'type' => 'new_blog_comment',
487
- 'item_id' => $blog_id,
488
- 'secondary_item_id' => $comment_id,
489
- 'recorded_time' => $recorded_comment->comment_date_gmt
490
) );
491
492
// Update the blogs last active date
472
// If blog is public allow activity to be posted
473
if ( get_blog_option( $blog_id, 'blog_public' ) ) {
474
475
+ // Get activity related links
476
+ $post_permalink = get_permalink( $recorded_comment->comment_post_ID );
477
+ $comment_link = htmlspecialchars( get_comment_link( $recorded_comment->comment_ID ) );
478
+
479
// Prepare to record in activity streams
480
+ $activity_action = sprintf( __( '%s commented on the blog post %s', 'buddypress' ), bp_core_get_userlink( $user_id ), '<a href="' . $post_permalink . '">' . $recorded_comment->post->post_title . '</a>' );
481
+ $activity_content = $recorded_comment->comment_content;
482
483
// Record in activity streams
484
bp_blogs_record_activity( array(
485
+ 'user_id' => $user_id,
486
+ 'action' => apply_filters( 'bp_blogs_activity_new_comment_action', $activity_action, &$recorded_comment, $comment_link ),
487
+ 'content' => apply_filters( 'bp_blogs_activity_new_comment_content', $activity_content, &$recorded_comment, $comment_link ),
488
+ 'primary_link' => apply_filters( 'bp_blogs_activity_new_comment_primary_link', $comment_link, &$recorded_comment ),
489
+ 'type' => 'new_blog_comment',
490
+ 'item_id' => $blog_id,
491
+ 'secondary_item_id' => $comment_id,
492
+ 'recorded_time' => $recorded_comment->comment_date_gmt
493
) );
494
495
// Update the blogs last active date
bp-blogs/bp-blogs-templatetags.php CHANGED
@@ -361,7 +361,7 @@ function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' )
361
global $current_site;
362
363
// Blog name
364
- if( 'no' == constant( "VHOST" ) )
365
echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
366
else
367
echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
@@ -370,18 +370,20 @@ function bp_blogs_signup_blog( $blogname = '', $blog_title = '', $errors = '' )
370
<p class="error"><?php echo $errmsg ?></p>
371
<?php }
372
373
- if( 'no' == constant( "VHOST" ) ) {
374
echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
375
- } else {
376
echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
377
- }
378
if ( !is_user_logged_in() ) {
379
print '(<strong>' . __( 'Your address will be ' , 'buddypress');
380
- if( 'no' == constant( "VHOST" ) ) {
381
print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
382
} else {
383
print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
384
}
385
echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
386
}
387
361
global $current_site;
362
363
// Blog name
364
+ if( !is_subdomain_install() )
365
echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
366
else
367
echo '<label for="blogname">' . __('Blog Domain:', 'buddypress') . '</label>';
370
<p class="error"><?php echo $errmsg ?></p>
371
<?php }
372
373
+ if ( !is_subdomain_install() )
374
echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
375
+ else
376
echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
377
+
378
if ( !is_user_logged_in() ) {
379
print '(<strong>' . __( 'Your address will be ' , 'buddypress');
380
+
381
+ if ( !is_subdomain_install() ) {
382
print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
383
} else {
384
print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
385
}
386
+
387
echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
388
}
389
bp-core/bp-core-avatars.php CHANGED
@@ -540,7 +540,7 @@ function bp_core_avatar_upload_path() {
540
541
// If multisite, and current blog does not match root blog, make adjustments
542
if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
543
- $upload_dir['basedir'] = str_replace( $current_blog->blog_id, BP_ROOT_BLOG, BLOGUPLOADDIR );
544
545
return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
546
}
540
541
// If multisite, and current blog does not match root blog, make adjustments
542
if ( bp_core_is_multisite() && BP_ROOT_BLOG != $current_blog->blog_id )
543
+ $upload_dir['basedir'] = WP_CONTENT_DIR . '/blogs.dir/' . BP_ROOT_BLOG . '/files/';
544
545
return apply_filters( 'bp_core_avatar_upload_path', $upload_dir['basedir'] );
546
}
bp-core/bp-core-catchuri.php CHANGED
@@ -135,7 +135,7 @@ function bp_core_set_uri_globals() {
135
if ( !isset($is_root_component) )
136
$is_root_component = in_array( $bp_uri[0], $bp->root_components );
137
138
- if ( 'no' == VHOST && !$is_root_component ) {
139
$component_index++;
140
$action_index++;
141
}
@@ -154,7 +154,7 @@ function bp_core_set_uri_globals() {
154
unset($action_variables[$action_index]);
155
156
/* Remove the username from action variables if this is not a VHOST install */
157
- if ( 'no' == VHOST && !$is_root_component )
158
array_shift($action_variables);
159
160
/* Reset the keys by merging with an empty array */
@@ -255,8 +255,12 @@ function bp_core_catch_no_access() {
255
if ( !$bp->displayed_user->id && $bp_unfiltered_uri[0] == BP_MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
256
bp_core_redirect( $bp->root_domain );
257
258
// If the template file doesn't exist, redirect to the root domain.
259
- if ( !bp_is_blog_page() && !file_exists( apply_filters( 'bp_located_template', locate_template( array( $bp_path . '.php' ), false ), array( $bp_path . '.php' ) ) ) )
260
bp_core_redirect( $bp->root_domain );
261
262
if ( !$bp_path && !bp_is_blog_page() ) {
135
if ( !isset($is_root_component) )
136
$is_root_component = in_array( $bp_uri[0], $bp->root_components );
137
138
+ if ( !is_subdomain_install() && !$is_root_component ) {
139
$component_index++;
140
$action_index++;
141
}
154
unset($action_variables[$action_index]);
155
156
/* Remove the username from action variables if this is not a VHOST install */
157
+ if ( !is_subdomain_install() && !$is_root_component )
158
array_shift($action_variables);
159
160
/* Reset the keys by merging with an empty array */
255
if ( !$bp->displayed_user->id && $bp_unfiltered_uri[0] == BP_MEMBERS_SLUG && isset($bp_unfiltered_uri[1]) )
256
bp_core_redirect( $bp->root_domain );
257
258
+ // Add .php to all options in $bp_path
259
+ foreach( (array) $bp_path as $template )
260
+ $filtered_templates[] = "$template.php";
261
+
262
// If the template file doesn't exist, redirect to the root domain.
263
+ if ( !bp_is_blog_page() && !file_exists( apply_filters( 'bp_located_template', locate_template( $filtered_templates, false ), $filtered_templates ) ) )
264
bp_core_redirect( $bp->root_domain );
265
266
if ( !$bp_path && !bp_is_blog_page() ) {
bp-core/bp-core-wpabstraction.php CHANGED
@@ -89,3 +89,12 @@ if ( !function_exists( 'update_blog_status' ) ) {
89
return true;
90
}
91
}
89
return true;
90
}
91
}
92
+
93
+ if ( !function_exists( 'is_subdomain_install' ) ) {
94
+ function is_subdomain_install() {
95
+ if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) )
96
+ return true;
97
+
98
+ return false;
99
+ }
100
+ }
bp-forums.php CHANGED
@@ -78,6 +78,8 @@ function bp_forums_directory_forums_setup() {
78
bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
79
80
bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug . '/' );
81
}
82
}
83
}
78
bp_core_add_message( __( 'The topic was created successfully', 'buddypress') );
79
80
bp_core_redirect( bp_get_group_permalink( $bp->groups->current_group ) . '/forum/topic/' . $topic->topic_slug . '/' );
81
+ } else {
82
+ bp_core_add_message( __( 'Please pick the group forum where you would like to post this topic.', 'buddypress' ), 'error' );
83
}
84
}
85
}
bp-groups/bp-groups-classes.php CHANGED
@@ -1050,8 +1050,8 @@ Class BP_Groups_Member {
1050
global $wpdb, $bp;
1051
1052
// Get all the group ids for the current user's groups and update counts
1053
- $group_ids = $this->get_group_ids( $user_id );
1054
- foreach ( $group_ids->groups as $group_id ) {
1055
groups_update_groupmeta( $group_id, 'total_member_count', groups_get_total_member_count( $group_id ) - 1 );
1056
}
1057
1050
global $wpdb, $bp;
1051
1052
// Get all the group ids for the current user's groups and update counts
1053
+ $group_ids = BP_Groups_Member::get_group_ids( $user_id );
1054
+ foreach ( $group_ids['groups'] as $group_id ) {
1055
groups_update_groupmeta( $group_id, 'total_member_count', groups_get_total_member_count( $group_id ) - 1 );
1056
}
1057
bp-languages/buddypress.pot CHANGED
@@ -8,7 +8,7 @@ msgid ""
8
msgstr ""
9
"Project-Id-Version: BuddyPress \n"
10
"Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
11
- "POT-Creation-Date: 2010-06-27 13:13+0000\n"
12
"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -54,7 +54,7 @@ msgstr ""
54
msgid "You do not have access to this activity."
55
msgstr ""
56
57
- #: bp-activity.php:269 bp-blogs/bp-blogs-templatetags.php:404
58
#: bp-core/bp-core-admin.php:60 bp-core/bp-core-admin.php:68
59
#: bp-core/bp-core-admin.php:75 bp-core/bp-core-admin.php:82
60
#: bp-core/bp-core-admin.php:90 bp-core/bp-core-admin.php:99
@@ -65,7 +65,7 @@ msgstr ""
65
msgid "Yes"
66
msgstr ""
67
68
- #: bp-activity.php:270 bp-blogs/bp-blogs-templatetags.php:408
69
#: bp-core/bp-core-admin.php:61 bp-core/bp-core-admin.php:69
70
#: bp-core/bp-core-admin.php:76 bp-core/bp-core-admin.php:83
71
#: bp-core/bp-core-admin.php:91 bp-core/bp-core-admin.php:100
@@ -383,7 +383,7 @@ msgstr ""
383
msgid "%s wrote a new blog post: %s"
384
msgstr ""
385
386
- #: bp-blogs.php:477
387
#, php-format
388
msgid "%s commented on the blog post %s"
389
msgstr ""
@@ -444,67 +444,67 @@ msgstr ""
444
msgid "Your address will be "
445
msgstr ""
446
447
- #: bp-blogs/bp-blogs-templatetags.php:381
448
msgid "blogname"
449
msgstr ""
450
451
- #: bp-blogs/bp-blogs-templatetags.php:383
452
msgid "domain."
453
msgstr ""
454
455
- #: bp-blogs/bp-blogs-templatetags.php:385
456
msgid ""
457
"Must be at least 4 characters, letters and numbers only. It cannot be "
458
"changed so choose carefully!)"
459
msgstr ""
460
461
- #: bp-blogs/bp-blogs-templatetags.php:390
462
msgid "Blog Title:"
463
msgstr ""
464
465
- #: bp-blogs/bp-blogs-templatetags.php:398
466
msgid "Privacy:"
467
msgstr ""
468
469
- #: bp-blogs/bp-blogs-templatetags.php:399
470
msgid ""
471
"I would like my blog to appear in search engines like Google and Technorati, "
472
"and in public listings around this site."
473
msgstr ""
474
475
- #: bp-blogs/bp-blogs-templatetags.php:459
476
msgid "Congratulations! You have successfully registered a new blog."
477
msgstr ""
478
479
- #: bp-blogs/bp-blogs-templatetags.php:461
480
#, php-format
481
msgid ""
482
"<a href=\"http://%1$s\">http://%2$s</a> is your new blog. <a href=\"%3$s"
483
"\">Login</a> as \"%4$s\" using your existing password."
484
msgstr ""
485
486
- #: bp-blogs/bp-blogs-templatetags.php:471 bp-core/bp-core-templatetags.php:940
487
#: bp-themes/bp-default/blogs/create.php:10
488
#: bp-themes/bp-default/blogs/index.php:8
489
msgid "Create a Blog"
490
msgstr ""
491
492
- #: bp-blogs/bp-blogs-templatetags.php:485
493
#, php-format
494
msgid "%s's Blogs"
495
msgstr ""
496
497
- #: bp-blogs/bp-blogs-templatetags.php:486
498
#, php-format
499
msgid "%s's Recent Posts"
500
msgstr ""
501
502
- #: bp-blogs/bp-blogs-templatetags.php:487
503
#, php-format
504
msgid "%s's Recent Comments"
505
msgstr ""
506
507
- #: bp-blogs/bp-blogs-templatetags.php:496 bp-core/bp-core-templatetags.php:474
508
#: bp-core/bp-core-templatetags.php:480
509
#: bp-forums/bp-forums-templatetags.php:1011
510
#: bp-forums/bp-forums-templatetags.php:1017
@@ -514,7 +514,7 @@ msgstr ""
514
msgid "Search anything..."
515
msgstr ""
516
517
- #: bp-blogs/bp-blogs-templatetags.php:497 bp-core/bp-core-templatetags.php:481
518
#: bp-core/bp-core-templatetags.php:1060
519
#: bp-forums/bp-forums-templatetags.php:1018
520
#: bp-groups/bp-groups-templatetags.php:1708
@@ -1336,7 +1336,11 @@ msgstr ""
1336
msgid "The topic was created successfully"
1337
msgstr ""
1338
1339
- #: bp-forums.php:101 bp-forums/bp-forums-admin.php:8
1340
msgid "Forums Setup"
1341
msgstr ""
1342
@@ -3009,7 +3013,7 @@ msgid "My Blogs (%s)"
3009
msgstr ""
3010
3011
#: bp-themes/bp-default/blogs/index.php:28
3012
- #: bp-themes/bp-default/forums/index.php:89
3013
#: bp-themes/bp-default/groups/index.php:27
3014
#: bp-themes/bp-default/members/index.php:28
3015
#: bp-themes/bp-default/members/single/blogs.php:6
@@ -3020,7 +3024,7 @@ msgid "Order By:"
3020
msgstr ""
3021
3022
#: bp-themes/bp-default/blogs/index.php:30
3023
- #: bp-themes/bp-default/forums/index.php:91
3024
#: bp-themes/bp-default/groups/index.php:29
3025
#: bp-themes/bp-default/members/index.php:30
3026
#: bp-themes/bp-default/members/single/blogs.php:8
@@ -3186,17 +3190,17 @@ msgstr ""
3186
msgid "Post In Group Forum:"
3187
msgstr ""
3188
3189
- #: bp-themes/bp-default/forums/index.php:56
3190
#: bp-themes/bp-default/groups/single/forum.php:47
3191
msgid "Post Topic"
3192
msgstr ""
3193
3194
- #: bp-themes/bp-default/forums/index.php:57
3195
#: bp-xprofile/bp-xprofile-classes.php:626
3196
msgid "Cancel"
3197
msgstr ""
3198
3199
- #: bp-themes/bp-default/forums/index.php:67
3200
#, php-format
3201
msgid ""
3202
"You are not a member of any groups so you don't have any group forums you "
@@ -3206,21 +3210,21 @@ msgid ""
3206
"post your topic in that group's forum."
3207
msgstr ""
3208
3209
- #: bp-themes/bp-default/forums/index.php:79
3210
#, php-format
3211
msgid "All Topics (%s)"
3212
msgstr ""
3213
3214
- #: bp-themes/bp-default/forums/index.php:82
3215
#, php-format
3216
msgid "My Topics (%s)"
3217
msgstr ""
3218
3219
- #: bp-themes/bp-default/forums/index.php:92
3220
msgid "Most Posts"
3221
msgstr ""
3222
3223
- #: bp-themes/bp-default/forums/index.php:93
3224
msgid "Unreplied"
3225
msgstr ""
3226
8
msgstr ""
9
"Project-Id-Version: BuddyPress \n"
10
"Report-Msgid-Bugs-To: wp-polyglots@lists.automattic.com\n"
11
+ "POT-Creation-Date: 2010-07-04 13:13+0000\n"
12
"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n"
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
"Language-Team: LANGUAGE <LL@li.org>\n"
54
msgid "You do not have access to this activity."
55
msgstr ""
56
57
+ #: bp-activity.php:269 bp-blogs/bp-blogs-templatetags.php:406
58
#: bp-core/bp-core-admin.php:60 bp-core/bp-core-admin.php:68
59
#: bp-core/bp-core-admin.php:75 bp-core/bp-core-admin.php:82
60
#: bp-core/bp-core-admin.php:90 bp-core/bp-core-admin.php:99
65
msgid "Yes"
66
msgstr ""
67
68
+ #: bp-activity.php:270 bp-blogs/bp-blogs-templatetags.php:410
69
#: bp-core/bp-core-admin.php:61 bp-core/bp-core-admin.php:69
70
#: bp-core/bp-core-admin.php:76 bp-core/bp-core-admin.php:83
71
#: bp-core/bp-core-admin.php:91 bp-core/bp-core-admin.php:100
383
msgid "%s wrote a new blog post: %s"
384
msgstr ""
385
386
+ #: bp-blogs.php:480
387
#, php-format
388
msgid "%s commented on the blog post %s"
389
msgstr ""
444
msgid "Your address will be "
445
msgstr ""
446
447
+ #: bp-blogs/bp-blogs-templatetags.php:382
448
msgid "blogname"
449
msgstr ""
450
451
+ #: bp-blogs/bp-blogs-templatetags.php:384
452
msgid "domain."
453
msgstr ""
454
455
+ #: bp-blogs/bp-blogs-templatetags.php:387
456
msgid ""
457
"Must be at least 4 characters, letters and numbers only. It cannot be "
458
"changed so choose carefully!)"
459
msgstr ""
460
461
+ #: bp-blogs/bp-blogs-templatetags.php:392
462
msgid "Blog Title:"
463
msgstr ""
464
465
+ #: bp-blogs/bp-blogs-templatetags.php:400
466
msgid "Privacy:"
467
msgstr ""
468
469
+ #: bp-blogs/bp-blogs-templatetags.php:401
470
msgid ""
471
"I would like my blog to appear in search engines like Google and Technorati, "
472
"and in public listings around this site."
473
msgstr ""
474
475
+ #: bp-blogs/bp-blogs-templatetags.php:461
476
msgid "Congratulations! You have successfully registered a new blog."
477
msgstr ""
478
479
+ #: bp-blogs/bp-blogs-templatetags.php:463
480
#, php-format
481
msgid ""
482
"<a href=\"http://%1$s\">http://%2$s</a> is your new blog. <a href=\"%3$s"
483
"\">Login</a> as \"%4$s\" using your existing password."
484
msgstr ""
485
486
+ #: bp-blogs/bp-blogs-templatetags.php:473 bp-core/bp-core-templatetags.php:940
487
#: bp-themes/bp-default/blogs/create.php:10
488
#: bp-themes/bp-default/blogs/index.php:8
489
msgid "Create a Blog"
490
msgstr ""
491
492
+ #: bp-blogs/bp-blogs-templatetags.php:487
493
#, php-format
494
msgid "%s's Blogs"
495
msgstr ""
496
497
+ #: bp-blogs/bp-blogs-templatetags.php:488
498
#, php-format
499
msgid "%s's Recent Posts"
500
msgstr ""
501
502
+ #: bp-blogs/bp-blogs-templatetags.php:489
503
#, php-format
504
msgid "%s's Recent Comments"
505
msgstr ""
506
507
+ #: bp-blogs/bp-blogs-templatetags.php:498 bp-core/bp-core-templatetags.php:474
508
#: bp-core/bp-core-templatetags.php:480
509
#: bp-forums/bp-forums-templatetags.php:1011
510
#: bp-forums/bp-forums-templatetags.php:1017
514
msgid "Search anything..."
515
msgstr ""
516
517
+ #: bp-blogs/bp-blogs-templatetags.php:499 bp-core/bp-core-templatetags.php:481
518
#: bp-core/bp-core-templatetags.php:1060
519
#: bp-forums/bp-forums-templatetags.php:1018
520
#: bp-groups/bp-groups-templatetags.php:1708
1336
msgid "The topic was created successfully"
1337
msgstr ""
1338
1339
+ #: bp-forums.php:82
1340
+ msgid "Please pick the group forum where you would like to post this topic."
1341
+ msgstr ""
1342
+
1343
+ #: bp-forums.php:103 bp-forums/bp-forums-admin.php:8
1344
msgid "Forums Setup"
1345
msgstr ""
1346
3013
msgstr ""
3014
3015
#: bp-themes/bp-default/blogs/index.php:28
3016
+ #: bp-themes/bp-default/forums/index.php:91
3017
#: bp-themes/bp-default/groups/index.php:27
3018
#: bp-themes/bp-default/members/index.php:28
3019
#: bp-themes/bp-default/members/single/blogs.php:6
3024
msgstr ""
3025
3026
#: bp-themes/bp-default/blogs/index.php:30
3027
+ #: bp-themes/bp-default/forums/index.php:93
3028
#: bp-themes/bp-default/groups/index.php:29
3029
#: bp-themes/bp-default/members/index.php:30
3030
#: bp-themes/bp-default/members/single/blogs.php:8
3190
msgid "Post In Group Forum:"
3191
msgstr ""
3192
3193
+ #: bp-themes/bp-default/forums/index.php:58
3194
#: bp-themes/bp-default/groups/single/forum.php:47
3195
msgid "Post Topic"
3196
msgstr ""
3197
3198
+ #: bp-themes/bp-default/forums/index.php:59
3199
#: bp-xprofile/bp-xprofile-classes.php:626
3200
msgid "Cancel"
3201
msgstr ""
3202
3203
+ #: bp-themes/bp-default/forums/index.php:69
3204
#, php-format
3205
msgid ""
3206
"You are not a member of any groups so you don't have any group forums you "
3210
"post your topic in that group's forum."
3211
msgstr ""
3212
3213
+ #: bp-themes/bp-default/forums/index.php:81
3214
#, php-format
3215
msgid "All Topics (%s)"
3216
msgstr ""
3217
3218
+ #: bp-themes/bp-default/forums/index.php:84
3219
#, php-format
3220
msgid "My Topics (%s)"
3221
msgstr ""
3222
3223
+ #: bp-themes/bp-default/forums/index.php:94
3224
msgid "Most Posts"
3225
msgstr ""
3226
3227
+ #: bp-themes/bp-default/forums/index.php:95
3228
msgid "Unreplied"
3229
msgstr ""
3230
bp-loader.php CHANGED
@@ -4,13 +4,13 @@ Plugin Name: BuddyPress
4
Plugin URI: http://buddypress.org/download/
5
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.
6
Author: The BuddyPress Community
7
- Version: 1.2.5
8
Author URI: http://buddypress.org/developers/
9
Site Wide Only: true
10
Network: true
11
*/
12
13
- define( 'BP_VERSION', '1.2.5' );
14
15
/***
16
* This file will load in each BuddyPress component based on which
4
Plugin URI: http://buddypress.org/download/
5
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.
6
Author: The BuddyPress Community
7
+ Version: 1.2.5.1
8
Author URI: http://buddypress.org/developers/
9
Site Wide Only: true
10
Network: true
11
*/
12
13
+ define( 'BP_VERSION', '1.2.5.1' );
14
15
/***
16
* This file will load in each BuddyPress component based on which
bp-themes/bp-default/forums/index.php CHANGED
@@ -38,6 +38,8 @@
38
<label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
39
<select id="topic_group_id" name="topic_group_id">
40
41
<?php while ( bp_groups() ) : bp_the_group(); ?>
42
43
<?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
38
<label><?php _e( 'Post In Group Forum:', 'buddypress' ) ?></label>
39
<select id="topic_group_id" name="topic_group_id">
40
41
+ <option value="">----</option>
42
+
43
<?php while ( bp_groups() ) : bp_the_group(); ?>
44
45
<?php if ( bp_group_is_forum_enabled() && 'public' == bp_get_group_status() ) : ?>
bp-themes/bp-default/registration/register.php CHANGED
@@ -180,7 +180,7 @@
180
<label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
181
<?php do_action( 'bp_signup_blog_url_errors' ) ?>
182
183
- <?php if ( 'yes' == VHOST ) : ?>
184
http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php echo str_replace( 'http://', '', site_url() ) ?>
185
<?php else : ?>
186
<?php echo site_url() ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" />
180
<label for="signup_blog_url"><?php _e( 'Blog URL', 'buddypress' ) ?> <?php _e( '(required)', 'buddypress' ) ?></label>
181
<?php do_action( 'bp_signup_blog_url_errors' ) ?>
182
183
+ <?php if ( is_subdomain_install() ) : ?>
184
http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php echo str_replace( 'http://', '', site_url() ) ?>
185
<?php else : ?>
186
<?php echo site_url() ?>/ <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" />
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: The default theme for BuddyPress.
5
- Version: 1.2.5
6
Author: BuddyPress.org
7
Author URI: http://buddypress.org
8
Tags: buddypress, two-columns, custom-header, white, blue
2
Theme Name: BuddyPress Default
3
Theme URI: http://buddypress.org/extend/themes/
4
Description: The default theme for BuddyPress.
5
+ Version: 1.2.5.2
6
Author: BuddyPress.org
7
Author URI: http://buddypress.org
8
Tags: buddypress, two-columns, custom-header, white, blue
readme.txt CHANGED
@@ -1,9 +1,9 @@
1
=== Plugin Name ===
2
Contributors: apeatling, johnjamesjacoby, mrmaz
3
Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
4
- Requires at least: 2.9.2
5
Tested up to: 3.0
6
- Stable tag: 1.2.5
7
8
== Description ==
9
@@ -123,8 +123,8 @@ The <a href="http://i18n.svn.buddypress.org/">BuddyPress langauge file repositor
123
124
== Upgrade Notice ==
125
126
- = 1.2.5 =
127
- Bug fixes and improved support for WordPress 3.0. Important upgrade.
128
129
== Changelog ==
130
1
=== Plugin Name ===
2
Contributors: apeatling, johnjamesjacoby, mrmaz
3
Tags: buddypress, social networking, activity, profiles, messaging, friends, groups, forums, microblogging, twitter, facebook, mingle, social, community, networks, networking, cms
4
+ Requires at least: 3.0
5
Tested up to: 3.0
6
+ Stable tag: 1.2.5.1
7
8
== Description ==
9
123
124
== Upgrade Notice ==
125
126
+ = 1.2.5.1 =
127
+ Fixes 'Mark user as spam' and 'Delete user' issues. Important upgrade.
128
129
== Changelog ==
130