bbPress - Version 2.1.1

Version Description

  • Fixed Invision, phpBB, and vBulletin importers
  • Fixed private/hidden forum bugs
  • Fixed topic split meta values
  • Fixed theme compatibility logic error
  • Fixed role mask issues for shared user installs
  • Fixed missing function cruft
  • Fixed missing filter on displayed user fields
Download this release

Release Info

Developer johnjamesjacoby
Plugin Icon 128x128 bbPress
Version 2.1.1
Comparing to
See all releases

Code changes from version 2.1 to 2.1.1

bbp-admin/bbp-forums.php CHANGED
@@ -86,7 +86,7 @@ class BBP_Forums_Admin {
86
  * @return boolean
87
  */
88
  private function bail() {
89
- if ( $this->post_type != get_current_screen()->post_type )
90
  return true;
91
 
92
  return false;
@@ -302,6 +302,10 @@ class BBP_Forums_Admin {
302
  if ( empty( $_POST['bbp_forum_metabox'] ) || !wp_verify_nonce( $_POST['bbp_forum_metabox'], 'bbp_forum_metabox_save' ) )
303
  return $forum_id;
304
 
 
 
 
 
305
  // Bail if current user cannot edit this forum
306
  if ( !current_user_can( 'edit_forum', $forum_id ) )
307
  return $forum_id;
86
  * @return boolean
87
  */
88
  private function bail() {
89
+ if ( !isset( get_current_screen()->post_type ) || ( $this->post_type != get_current_screen()->post_type ) )
90
  return true;
91
 
92
  return false;
302
  if ( empty( $_POST['bbp_forum_metabox'] ) || !wp_verify_nonce( $_POST['bbp_forum_metabox'], 'bbp_forum_metabox_save' ) )
303
  return $forum_id;
304
 
305
+ // Only save for forum post-types
306
+ if ( ! bbp_is_forum( $forum_id ) )
307
+ return $forum_id;
308
+
309
  // Bail if current user cannot edit this forum
310
  if ( !current_user_can( 'edit_forum', $forum_id ) )
311
  return $forum_id;
bbp-admin/bbp-replies.php CHANGED
@@ -98,7 +98,7 @@ class BBP_Replies_Admin {
98
  * @return boolean
99
  */
100
  private function bail() {
101
- if ( $this->post_type != get_current_screen()->post_type )
102
  return true;
103
 
104
  return false;
98
  * @return boolean
99
  */
100
  private function bail() {
101
+ if ( !isset( get_current_screen()->post_type ) || ( $this->post_type != get_current_screen()->post_type ) )
102
  return true;
103
 
104
  return false;
bbp-admin/bbp-tools.php CHANGED
@@ -159,16 +159,17 @@ function bbp_admin_repair_list() {
159
  $repair_list = array(
160
  0 => array( 'bbp-sync-topic-meta', __( 'Recalculate the parent topic for each post', 'bbpress' ), 'bbp_admin_repair_topic_meta' ),
161
  5 => array( 'bbp-sync-forum-meta', __( 'Recalculate the parent forum for each post', 'bbpress' ), 'bbp_admin_repair_forum_meta' ),
162
- 10 => array( 'bbp-forum-topics', __( 'Count topics in each forum', 'bbpress' ), 'bbp_admin_repair_forum_topic_count' ),
163
- 15 => array( 'bbp-forum-replies', __( 'Count replies in each forum', 'bbpress' ), 'bbp_admin_repair_forum_reply_count' ),
164
- 20 => array( 'bbp-topic-replies', __( 'Count replies in each topic', 'bbpress' ), 'bbp_admin_repair_topic_reply_count' ),
165
- 25 => array( 'bbp-topic-voices', __( 'Count voices in each topic', 'bbpress' ), 'bbp_admin_repair_topic_voice_count' ),
166
- 30 => array( 'bbp-topic-hidden-replies', __( 'Count spammed & trashed replies in each topic', 'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
167
- 35 => array( 'bbp-user-replies', __( 'Count topics for each user', 'bbpress' ), 'bbp_admin_repair_user_topic_count' ),
168
- 35 => array( 'bbp-user-topics', __( 'Count replies for each user', 'bbpress' ), 'bbp_admin_repair_user_reply_count' ),
169
- 40 => array( 'bbp-user-favorites', __( 'Remove trashed topics from user favorites', 'bbpress' ), 'bbp_admin_repair_user_favorites' ),
170
- 45 => array( 'bbp-user-subscriptions', __( 'Remove trashed topics from user subscriptions', 'bbpress' ), 'bbp_admin_repair_user_subscriptions' ),
171
- 50 => array( 'bbp-sync-all-topics-forums', __( 'Recalculate last activity in each topic and forum', 'bbpress' ), 'bbp_admin_repair_freshness' )
 
172
  );
173
  ksort( $repair_list );
174
 
@@ -683,6 +684,54 @@ function bbp_admin_repair_freshness() {
683
  return array( 0, sprintf( $statement, $result ) );
684
  }
685
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
686
  /**
687
  * Recaches the forum for each post
688
  *
159
  $repair_list = array(
160
  0 => array( 'bbp-sync-topic-meta', __( 'Recalculate the parent topic for each post', 'bbpress' ), 'bbp_admin_repair_topic_meta' ),
161
  5 => array( 'bbp-sync-forum-meta', __( 'Recalculate the parent forum for each post', 'bbpress' ), 'bbp_admin_repair_forum_meta' ),
162
+ 10 => array( 'bbp-sync-forum-visibility', __( 'Recalculate private and hidden forums', 'bbpress' ), 'bbp_admin_repair_forum_visibility' ),
163
+ 15 => array( 'bbp-forum-topics', __( 'Count topics in each forum', 'bbpress' ), 'bbp_admin_repair_forum_topic_count' ),
164
+ 20 => array( 'bbp-forum-replies', __( 'Count replies in each forum', 'bbpress' ), 'bbp_admin_repair_forum_reply_count' ),
165
+ 25 => array( 'bbp-topic-replies', __( 'Count replies in each topic', 'bbpress' ), 'bbp_admin_repair_topic_reply_count' ),
166
+ 30 => array( 'bbp-topic-voices', __( 'Count voices in each topic', 'bbpress' ), 'bbp_admin_repair_topic_voice_count' ),
167
+ 35 => array( 'bbp-topic-hidden-replies', __( 'Count spammed & trashed replies in each topic', 'bbpress' ), 'bbp_admin_repair_topic_hidden_reply_count' ),
168
+ 40 => array( 'bbp-user-replies', __( 'Count topics for each user', 'bbpress' ), 'bbp_admin_repair_user_topic_count' ),
169
+ 45 => array( 'bbp-user-topics', __( 'Count replies for each user', 'bbpress' ), 'bbp_admin_repair_user_reply_count' ),
170
+ 50 => array( 'bbp-user-favorites', __( 'Remove trashed topics from user favorites', 'bbpress' ), 'bbp_admin_repair_user_favorites' ),
171
+ 55 => array( 'bbp-user-subscriptions', __( 'Remove trashed topics from user subscriptions', 'bbpress' ), 'bbp_admin_repair_user_subscriptions' ),
172
+ 60 => array( 'bbp-sync-all-topics-forums', __( 'Recalculate last activity in each topic and forum', 'bbpress' ), 'bbp_admin_repair_freshness' )
173
  );
174
  ksort( $repair_list );
175
 
684
  return array( 0, sprintf( $statement, $result ) );
685
  }
686
 
687
+ /**
688
+ * Recaches the private and hidden forums
689
+ *
690
+ * @since bbPress (r4104)
691
+ *
692
+ * @uses delete_option() to delete private and hidden forum pointers
693
+ * @uses WP_Query() To query post IDs
694
+ * @uses is_wp_error() To return if error occurred
695
+ * @uses update_option() To update the private and hidden post ID pointers
696
+ * @return array An array of the status code and the message
697
+ */
698
+ function bbp_admin_repair_forum_visibility() {
699
+
700
+ $statement = __( 'Recalculating forum visibility … %s', 'bbpress' );
701
+ $result = __( 'Failed!', 'bbpress' );
702
+
703
+ // First, delete everything.
704
+ delete_option( '_bbp_private_forums' );
705
+ delete_option( '_bbp_hidden_forums' );
706
+
707
+ // Next, get all the private and hidden forums
708
+ $private_forums = new WP_Query( array(
709
+ 'suppress_filters' => true,
710
+ 'nopaging' => true,
711
+ 'post_type' => bbp_get_forum_post_type(),
712
+ 'post_status' => bbp_get_private_status_id(),
713
+ 'fields' => 'ids'
714
+ ) );
715
+ $hidden_forums = new WP_Query( array(
716
+ 'suppress_filters' => true,
717
+ 'nopaging' => true,
718
+ 'post_type' => bbp_get_forum_post_type(),
719
+ 'post_status' => bbp_get_hidden_status_id(),
720
+ 'fields' => 'ids'
721
+ ) );
722
+
723
+ // Bail if queries returned errors
724
+ if ( is_wp_error( $private_forums ) || is_wp_error( $hidden_forums ) )
725
+ return array( 2, sprintf( $statement, $result ) );
726
+
727
+ update_option( '_bbp_private_forums', $private_forums->posts ); // Private forums
728
+ update_option( '_bbp_hidden_forums', $hidden_forums->posts ); // Hidden forums
729
+
730
+ // Complete results
731
+ $result = __( 'Complete!', 'bbpress' );
732
+ return array( 0, sprintf( $statement, $result ) );
733
+ }
734
+
735
  /**
736
  * Recaches the forum for each post
737
  *
bbp-admin/bbp-topics.php CHANGED
@@ -98,7 +98,7 @@ class BBP_Topics_Admin {
98
  * @return boolean
99
  */
100
  private function bail() {
101
- if ( $this->post_type != get_current_screen()->post_type )
102
  return true;
103
 
104
  return false;
98
  * @return boolean
99
  */
100
  private function bail() {
101
+ if ( !isset( get_current_screen()->post_type ) || ( $this->post_type != get_current_screen()->post_type ) )
102
  return true;
103
 
104
  return false;
bbp-admin/converters/Invision.php CHANGED
@@ -162,7 +162,7 @@ class Invision extends BBP_Converter_Base
162
 
163
  // Post id. Stores in postmeta.
164
  $this->field_map[] = array(
165
- 'from_tablename' => 'posts', 'from_fieldname' => 'pid', 'from_expression' => 'WHERE posts.new_topic = 1',
166
  'to_type' => 'reply', 'to_fieldname' => '_bbp_post_id'
167
  );
168
 
162
 
163
  // Post id. Stores in postmeta.
164
  $this->field_map[] = array(
165
+ 'from_tablename' => 'posts', 'from_fieldname' => 'pid', 'from_expression' => 'WHERE posts.new_topic = 0',
166
  'to_type' => 'reply', 'to_fieldname' => '_bbp_post_id'
167
  );
168
 
bbp-includes/bbp-common-functions.php CHANGED
@@ -1029,7 +1029,7 @@ Post Link: %3$s
1029
 
1030
  -----------
1031
 
1032
- You are recieving this email because you subscribed to a forum topic.
1033
 
1034
  Login and visit the topic to unsubscribe from these emails.', 'bbpress' ),
1035
 
1029
 
1030
  -----------
1031
 
1032
+ You are receiving this email because you subscribed to a forum topic.
1033
 
1034
  Login and visit the topic to unsubscribe from these emails.', 'bbpress' ),
1035
 
bbp-includes/bbp-core-caps.php CHANGED
@@ -518,7 +518,6 @@ function bbp_get_caps_for_role( $role = '' ) {
518
  *
519
  * @since bbPress (r3410)
520
  *
521
- * @uses is_multisite()
522
  * @uses bbp_allow_global_access()
523
  * @uses bbp_is_user_inactive()
524
  * @uses is_user_logged_in()
@@ -530,7 +529,7 @@ function bbp_get_caps_for_role( $role = '' ) {
530
  function bbp_global_access_auto_role() {
531
 
532
  // Bail if not multisite or forum is not global
533
- if ( !is_multisite() || !bbp_allow_global_access() )
534
  return;
535
 
536
  // Bail if user is not active
@@ -603,7 +602,6 @@ function bbp_get_moderator_role() {
603
  *
604
  * @since bbPress (r3380)
605
  *
606
- * @uses is_multisite()
607
  * @uses bbp_allow_global_access()
608
  * @uses bbp_is_user_inactive()
609
  * @uses is_user_logged_in()
@@ -616,7 +614,7 @@ function bbp_get_moderator_role() {
616
  function bbp_global_access_role_mask() {
617
 
618
  // Bail if not multisite or forum is not global
619
- if ( !is_multisite() || !bbp_allow_global_access() )
620
  return;
621
 
622
  // Bail if user is marked as spam or is deleted
518
  *
519
  * @since bbPress (r3410)
520
  *
 
521
  * @uses bbp_allow_global_access()
522
  * @uses bbp_is_user_inactive()
523
  * @uses is_user_logged_in()
529
  function bbp_global_access_auto_role() {
530
 
531
  // Bail if not multisite or forum is not global
532
+ if ( ! bbp_allow_global_access() )
533
  return;
534
 
535
  // Bail if user is not active
602
  *
603
  * @since bbPress (r3380)
604
  *
 
605
  * @uses bbp_allow_global_access()
606
  * @uses bbp_is_user_inactive()
607
  * @uses is_user_logged_in()
614
  function bbp_global_access_role_mask() {
615
 
616
  // Bail if not multisite or forum is not global
617
+ if ( ! bbp_allow_global_access() )
618
  return;
619
 
620
  // Bail if user is marked as spam or is deleted
bbp-includes/bbp-core-update.php CHANGED
@@ -140,6 +140,9 @@ function bbp_setup_updater() {
140
  // Are we running an outdated version of bbPress?
141
  if ( bbp_is_update() ) {
142
 
 
 
 
143
  // Bump the version
144
  bbp_version_bump();
145
 
@@ -209,3 +212,49 @@ function bbp_create_initial_content( $args = array() ) {
209
  'reply_id' => $reply_id
210
  );
211
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
140
  // Are we running an outdated version of bbPress?
141
  if ( bbp_is_update() ) {
142
 
143
+ // Call the automated updater
144
+ bbp_version_updater();
145
+
146
  // Bump the version
147
  bbp_version_bump();
148
 
212
  'reply_id' => $reply_id
213
  );
214
  }
215
+
216
+ /**
217
+ * bbPress's version updater looks at what the current database version is, and
218
+ * runs whatever other code is needed.
219
+ *
220
+ * This is most-often used when the data schema changes, but should also be used
221
+ * to correct issues with bbPress meta-data silently on software update.
222
+ *
223
+ * @since bbPress (r4104)
224
+ */
225
+ function bbp_version_updater() {
226
+
227
+ // Get the raw database version
228
+ $raw_db_version = (int) bbp_get_db_version_raw();
229
+
230
+ // Bail if no database version exists
231
+ if ( empty( $raw_db_version ) )
232
+ return;
233
+
234
+ /** 2.0 Branch ************************************************************/
235
+
236
+ // 2.0, 2.0.1, 2.0.2, 2.0.3
237
+ if ( $raw_db_version < 200 ) {
238
+ // Do nothing
239
+ }
240
+
241
+ /** 2.1 Branch ************************************************************/
242
+
243
+ // 2.1, 2.1.1
244
+ if ( $raw_db_version < 211 ) {
245
+
246
+ /**
247
+ * Repair private and hidden forum data
248
+ *
249
+ * @link http://bbpress.trac.wordpress.org/ticket/1891
250
+ */
251
+ bbp_admin_repair_forum_visibility();
252
+ }
253
+
254
+ /** 2.2 Branch ************************************************************/
255
+
256
+ // 2.2
257
+ if ( $raw_db_version < 220 ) {
258
+ // No changes yet
259
+ }
260
+ }
bbp-includes/bbp-extend-akismet.php CHANGED
@@ -393,7 +393,10 @@ class BBP_Akismet {
393
  $response = $this->http_post( $query_string, $akismet_api_host, $path, $akismet_api_port );
394
 
395
  // Check the high-speed cam
396
- $post_data['bbp_akismet_result'] = $response[1];
 
 
 
397
 
398
  // This is ham
399
  return $post_data;
393
  $response = $this->http_post( $query_string, $akismet_api_host, $path, $akismet_api_port );
394
 
395
  // Check the high-speed cam
396
+ if ( !empty( $response[1] ) && ! is_wp_error( $response[1] ) )
397
+ $post_data['bbp_akismet_result'] = $response[1];
398
+ else
399
+ $post_data['bbp_akismet_result'] = 'false';
400
 
401
  // This is ham
402
  return $post_data;
bbp-includes/bbp-forum-functions.php CHANGED
@@ -611,7 +611,7 @@ function bbp_save_forum_extras( $forum_id = 0 ) {
611
  $forum_id = bbp_get_forum_id( $forum_id );
612
 
613
  // Bail if forum ID is empty
614
- if ( empty( $forum_id ) )
615
  return;
616
 
617
  /** Forum Status ******************************************************/
611
  $forum_id = bbp_get_forum_id( $forum_id );
612
 
613
  // Bail if forum ID is empty
614
+ if ( empty( $forum_id ) || ! bbp_is_forum( $forum_id ) )
615
  return;
616
 
617
  /** Forum Status ******************************************************/
bbp-includes/bbp-theme-compatibility.php CHANGED
@@ -280,8 +280,8 @@ function bbp_register_theme_package( $theme = array(), $override = true ) {
280
  // Load up bbPress
281
  $bbp = bbpress();
282
 
283
- // Only override if the flag is set and notpreviously registered
284
- if ( ! empty( $bbp->theme_compat->packages[$theme->id] ) || ( true === $override ) ) {
285
  $bbp->theme_compat->packages[$theme->id] = $theme;
286
  }
287
  }
280
  // Load up bbPress
281
  $bbp = bbpress();
282
 
283
+ // Only override if the flag is set and not previously registered
284
+ if ( empty( $bbp->theme_compat->packages[$theme->id] ) || ( true === $override ) ) {
285
  $bbp->theme_compat->packages[$theme->id] = $theme;
286
  }
287
  }
bbp-includes/bbp-topic-functions.php CHANGED
@@ -1417,6 +1417,7 @@ function bbp_split_topic_handler() {
1417
  'post_name' => false,
1418
  'post_type' => bbp_get_topic_post_type(),
1419
  'post_parent' => $source_topic->post_parent,
 
1420
  'guid' => ''
1421
  );
1422
 
@@ -1441,7 +1442,7 @@ function bbp_split_topic_handler() {
1441
  }
1442
  }
1443
 
1444
- // Bail ir there are errors
1445
  if ( bbp_has_errors() )
1446
  return;
1447
 
@@ -1506,16 +1507,34 @@ function bbp_split_topic_handler() {
1506
  // Make sure there are replies to loop through
1507
  if ( !empty( $replies ) && !is_wp_error( $replies ) ) {
1508
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1509
  // Change the post_parent of each reply to the destination topic id
1510
  foreach ( $replies as $reply ) {
1511
 
 
 
 
1512
  // New reply data
1513
  $postarr = array(
1514
- 'ID' => $reply->ID,
1515
- 'post_title' => sprintf( __( 'Reply To: %s', 'bbpress' ), $destination_topic->post_title ),
1516
- 'post_name' => false, // will be automatically generated
1517
- 'post_parent' => $destination_topic->ID,
1518
- 'guid' => ''
 
1519
  );
1520
 
1521
  // Update the reply
@@ -1528,18 +1547,30 @@ function bbp_split_topic_handler() {
1528
  // Do additional actions per split reply
1529
  do_action( 'bbp_split_topic_reply', $reply->ID, $destination_topic->ID );
1530
  }
 
 
 
 
 
 
 
 
 
1531
  }
1532
 
1533
  // It is a new topic and we need to set some default metas to make
1534
  // the topic display in bbp_has_topics() list
1535
  if ( 'reply' == $split_option ) {
1536
- $last_reply_id = ( empty( $reply ) || empty( $reply->ID ) ) ? 0 : $reply->ID;
1537
- $freshness = ( empty( $reply ) || empty( $reply->post_date ) ) ? '' : $reply->post_date;
1538
-
1539
  bbp_update_topic_last_reply_id ( $destination_topic->ID, $last_reply_id );
 
1540
  bbp_update_topic_last_active_time( $destination_topic->ID, $freshness );
1541
  }
1542
 
 
 
 
 
 
1543
  /** Successful Split ******************************************************/
1544
 
1545
  // Update counts, etc...
1417
  'post_name' => false,
1418
  'post_type' => bbp_get_topic_post_type(),
1419
  'post_parent' => $source_topic->post_parent,
1420
+ 'menu_order' => '1',
1421
  'guid' => ''
1422
  );
1423
 
1442
  }
1443
  }
1444
 
1445
+ // Bail if there are errors
1446
  if ( bbp_has_errors() )
1447
  return;
1448
 
1507
  // Make sure there are replies to loop through
1508
  if ( !empty( $replies ) && !is_wp_error( $replies ) ) {
1509
 
1510
+ // Calculate starting point for reply positions
1511
+ switch ( $split_option ) {
1512
+
1513
+ // Get topic reply count for existing topic
1514
+ case 'existing' :
1515
+ $reply_position = bbp_get_topic_reply_count( $destination_topic->ID );
1516
+ break;
1517
+
1518
+ // Account for new lead topic
1519
+ case 'reply' :
1520
+ $reply_position = 1;
1521
+ break;
1522
+ }
1523
+
1524
  // Change the post_parent of each reply to the destination topic id
1525
  foreach ( $replies as $reply ) {
1526
 
1527
+ // Bump the reply position each iteration through the loop
1528
+ $reply_position++;
1529
+
1530
  // New reply data
1531
  $postarr = array(
1532
+ 'ID' => $reply->ID,
1533
+ 'post_title' => sprintf( __( 'Reply To: %s', 'bbpress' ), $destination_topic->post_title ),
1534
+ 'post_name' => false, // will be automatically generated
1535
+ 'post_parent' => $destination_topic->ID,
1536
+ 'post_position' => $reply_position,
1537
+ 'guid' => ''
1538
  );
1539
 
1540
  // Update the reply
1547
  // Do additional actions per split reply
1548
  do_action( 'bbp_split_topic_reply', $reply->ID, $destination_topic->ID );
1549
  }
1550
+
1551
+ // Set the last reply ID and freshness
1552
+ $last_reply_id = $reply->ID;
1553
+ $freshness = $reply->post_date;
1554
+
1555
+ // Set the last reply ID and freshness to the from_reply
1556
+ } else {
1557
+ $last_reply_id = $from_reply->ID;
1558
+ $freshness = $from_reply->post_date;
1559
  }
1560
 
1561
  // It is a new topic and we need to set some default metas to make
1562
  // the topic display in bbp_has_topics() list
1563
  if ( 'reply' == $split_option ) {
 
 
 
1564
  bbp_update_topic_last_reply_id ( $destination_topic->ID, $last_reply_id );
1565
+ bbp_update_topic_last_active_id ( $destination_topic->ID, $last_reply_id );
1566
  bbp_update_topic_last_active_time( $destination_topic->ID, $freshness );
1567
  }
1568
 
1569
+ // Update source topic ID last active
1570
+ bbp_update_topic_last_reply_id ( $source_topic->ID );
1571
+ bbp_update_topic_last_active_id ( $source_topic->ID );
1572
+ bbp_update_topic_last_active_time( $source_topic->ID );
1573
+
1574
  /** Successful Split ******************************************************/
1575
 
1576
  // Update counts, etc...
bbp-includes/bbp-user-functions.php CHANGED
@@ -1455,10 +1455,13 @@ function bbp_user_maybe_convert_pass() {
1455
  global $wpdb;
1456
 
1457
  // Bail if no user password to convert
1458
- $row = $wpdb->get_row( "SELECT * FROM {$wpdb->users} INNER JOIN {$wpdb->usermeta} ON user_id = ID WHERE meta_key = '_bbp_converter_class' AND user_login = '{$username}' LIMIT 1" );
1459
  if ( empty( $row ) || is_wp_error( $row ) )
1460
  return;
1461
 
 
 
 
1462
  // Convert password
1463
  require_once( bbpress()->admin->admin_dir . 'bbp-converter.php' );
1464
  require_once( bbpress()->admin->admin_dir . 'converters/' . $row->meta_value . '.php' );
1455
  global $wpdb;
1456
 
1457
  // Bail if no user password to convert
1458
+ $row = $wpdb->get_row( "SELECT * FROM {$wpdb->users} INNER JOIN {$wpdb->usermeta} ON user_id = ID WHERE meta_key = '_bbp_class' AND user_login = '{$username}' LIMIT 1" );
1459
  if ( empty( $row ) || is_wp_error( $row ) )
1460
  return;
1461
 
1462
+ // Setup admin (to include converter)
1463
+ require_once( bbpress()->plugin_dir . 'bbp-admin/bbp-admin.php' );
1464
+
1465
  // Convert password
1466
  require_once( bbpress()->admin->admin_dir . 'bbp-converter.php' );
1467
  require_once( bbpress()->admin->admin_dir . 'converters/' . $row->meta_value . '.php' );
bbp-includes/bbp-user-template.php CHANGED
@@ -124,17 +124,19 @@ function bbp_displayed_user_field( $field = '' ) {
124
  * @param string $field Field to get
125
  * @uses sanitize_text_field() To sanitize the field
126
  * @uses esc_attr() To sanitize the field
 
127
  * @return string|bool Value of the field if it exists, else false
128
  */
129
  function bbp_get_displayed_user_field( $field = '' ) {
130
- $bbp = bbpress();
 
131
 
132
  // Return field if exists
133
  if ( isset( $bbp->displayed_user->$field ) )
134
- return esc_attr( sanitize_text_field( $bbp->displayed_user->$field ) );
135
 
136
  // Return empty
137
- return false;
138
  }
139
 
140
  /**
124
  * @param string $field Field to get
125
  * @uses sanitize_text_field() To sanitize the field
126
  * @uses esc_attr() To sanitize the field
127
+ * @uses apply_filters() Calls 'bbp_get_displayed_user_field' with the value
128
  * @return string|bool Value of the field if it exists, else false
129
  */
130
  function bbp_get_displayed_user_field( $field = '' ) {
131
+ $bbp = bbpress();
132
+ $value = false;
133
 
134
  // Return field if exists
135
  if ( isset( $bbp->displayed_user->$field ) )
136
+ $value = esc_attr( sanitize_text_field( $bbp->displayed_user->$field ) );
137
 
138
  // Return empty
139
+ return apply_filters( 'bbp_get_displayed_user_field', $value, $field );
140
  }
141
 
142
  /**
bbp-languages/bbpress.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the bbPress package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: bbPress 2.1\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/bbpress\n"
7
- "POT-Creation-Date: 2012-07-08 11:08:18+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -31,7 +31,7 @@ msgid "Forum Import"
31
  msgstr ""
32
 
33
  #: bbp-admin/bbp-admin.php:183 bbp-admin/bbp-functions.php:199
34
- #: bbp-admin/bbp-tools.php:806
35
  msgid "Reset Forums"
36
  msgstr ""
37
 
@@ -502,7 +502,7 @@ msgid ""
502
  "if there are comments on the forum, you can see them here and moderate them."
503
  msgstr ""
504
 
505
- #: bbp-admin/bbp-forums.php:419 bbp-admin/bbp-metaboxes.php:50
506
  #: bbp-admin/bbp-metaboxes.php:345 bbp-admin/bbp-metaboxes.php:348
507
  #: bbp-admin/bbp-metaboxes.php:396 bbp-admin/bbp-metaboxes.php:399
508
  #: bbp-admin/bbp-replies.php:616 bbp-admin/bbp-topics.php:680
@@ -513,7 +513,7 @@ msgstr ""
513
  msgid "Forum"
514
  msgstr ""
515
 
516
- #: bbp-admin/bbp-forums.php:420 bbp-admin/bbp-settings.php:171
517
  #: bbp-admin/bbp-settings.php:192 bbp-admin/bbp-topics.php:679
518
  #: bbp-includes/bbp-extend-buddypress.php:432
519
  #: bbp-includes/bbp-extend-buddypress.php:1434
@@ -526,7 +526,7 @@ msgstr ""
526
  msgid "Topics"
527
  msgstr ""
528
 
529
- #: bbp-admin/bbp-forums.php:421 bbp-admin/bbp-settings.php:179
530
  #: bbp-admin/bbp-settings.php:200 bbp-admin/bbp-topics.php:681
531
  #: bbp-includes/bbp-extend-buddypress.php:433
532
  #: bbp-includes/bbp-forum-template.php:2336
@@ -546,19 +546,19 @@ msgstr ""
546
  msgid "Replies"
547
  msgstr ""
548
 
549
- #: bbp-admin/bbp-forums.php:422
550
  #: bbp-theme-compat/bbpress/content-single-topic-lead.php:18
551
  #: bbp-theme-compat/bbpress/content-single-topic-lead.php:90
552
  #: bbp-themes/bbp-twentyten/bbpress/content-single-topic-lead.php:17
553
  msgid "Creator"
554
  msgstr ""
555
 
556
- #: bbp-admin/bbp-forums.php:423 bbp-admin/bbp-replies.php:619
557
  #: bbp-admin/bbp-topics.php:684
558
  msgid "Created"
559
  msgstr ""
560
 
561
- #: bbp-admin/bbp-forums.php:424 bbp-admin/bbp-topics.php:685
562
  #: bbp-theme-compat/bbpress/loop-forums.php:22
563
  #: bbp-theme-compat/bbpress/loop-topics.php:22
564
  #: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:21
@@ -566,63 +566,63 @@ msgstr ""
566
  msgid "Freshness"
567
  msgstr ""
568
 
569
- #: bbp-admin/bbp-forums.php:461 bbp-admin/bbp-replies.php:727
570
  #: bbp-admin/bbp-topics.php:764
571
  msgid "%1$s <br /> %2$s"
572
  msgstr ""
573
 
574
- #: bbp-admin/bbp-forums.php:473 bbp-includes/bbp-forum-template.php:541
575
  msgid "No Topics"
576
  msgstr ""
577
 
578
- #: bbp-admin/bbp-forums.php:539
579
  msgid "Forum updated. <a href=\"%s\">View forum</a>"
580
  msgstr ""
581
 
582
- #: bbp-admin/bbp-forums.php:542 bbp-admin/bbp-replies.php:899
583
  #: bbp-admin/bbp-topics.php:970
584
  msgid "Custom field updated."
585
  msgstr ""
586
 
587
- #: bbp-admin/bbp-forums.php:545 bbp-admin/bbp-replies.php:902
588
  #: bbp-admin/bbp-topics.php:973
589
  msgid "Custom field deleted."
590
  msgstr ""
591
 
592
- #: bbp-admin/bbp-forums.php:548
593
  msgid "Forum updated."
594
  msgstr ""
595
 
596
  #. translators: %s: date and time of the revision
597
- #: bbp-admin/bbp-forums.php:553
598
  msgid "Forum restored to revision from %s"
599
  msgstr ""
600
 
601
- #: bbp-admin/bbp-forums.php:557
602
  msgid "Forum created. <a href=\"%s\">View forum</a>"
603
  msgstr ""
604
 
605
- #: bbp-admin/bbp-forums.php:560
606
  msgid "Forum saved."
607
  msgstr ""
608
 
609
- #: bbp-admin/bbp-forums.php:563
610
  msgid "Forum submitted. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
611
  msgstr ""
612
 
613
- #: bbp-admin/bbp-forums.php:566
614
  msgid ""
615
  "Forum scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href=\"%2$s"
616
  "\">Preview forum</a>"
617
  msgstr ""
618
 
619
  #. translators: Publish box date format, see http:php.net/date
620
- #: bbp-admin/bbp-forums.php:568 bbp-admin/bbp-replies.php:925
621
  #: bbp-admin/bbp-topics.php:996
622
  msgid "M j, Y @ G:i"
623
  msgstr ""
624
 
625
- #: bbp-admin/bbp-forums.php:573
626
  msgid "Forum draft updated. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
627
  msgstr ""
628
 
@@ -1598,209 +1598,219 @@ msgid "Recalculate the parent forum for each post"
1598
  msgstr ""
1599
 
1600
  #: bbp-admin/bbp-tools.php:162
1601
- msgid "Count topics in each forum"
1602
  msgstr ""
1603
 
1604
  #: bbp-admin/bbp-tools.php:163
1605
- msgid "Count replies in each forum"
1606
  msgstr ""
1607
 
1608
  #: bbp-admin/bbp-tools.php:164
1609
- msgid "Count replies in each topic"
1610
  msgstr ""
1611
 
1612
  #: bbp-admin/bbp-tools.php:165
1613
- msgid "Count voices in each topic"
1614
  msgstr ""
1615
 
1616
  #: bbp-admin/bbp-tools.php:166
1617
- msgid "Count spammed & trashed replies in each topic"
1618
  msgstr ""
1619
 
1620
  #: bbp-admin/bbp-tools.php:167
1621
- msgid "Count topics for each user"
1622
  msgstr ""
1623
 
1624
  #: bbp-admin/bbp-tools.php:168
1625
- msgid "Count replies for each user"
1626
  msgstr ""
1627
 
1628
  #: bbp-admin/bbp-tools.php:169
1629
- msgid "Remove trashed topics from user favorites"
1630
  msgstr ""
1631
 
1632
  #: bbp-admin/bbp-tools.php:170
1633
- msgid "Remove trashed topics from user subscriptions"
1634
  msgstr ""
1635
 
1636
  #: bbp-admin/bbp-tools.php:171
 
 
 
 
1637
  msgid "Recalculate last activity in each topic and forum"
1638
  msgstr ""
1639
 
1640
- #: bbp-admin/bbp-tools.php:194
1641
  msgid "Counting the number of replies in each topic&hellip; %s"
1642
  msgstr ""
1643
 
1644
- #: bbp-admin/bbp-tools.php:195 bbp-admin/bbp-tools.php:239
1645
- #: bbp-admin/bbp-tools.php:282 bbp-admin/bbp-tools.php:312
1646
- #: bbp-admin/bbp-tools.php:347 bbp-admin/bbp-tools.php:380
1647
- #: bbp-admin/bbp-tools.php:427 bbp-admin/bbp-tools.php:474
1648
- #: bbp-admin/bbp-tools.php:534 bbp-admin/bbp-tools.php:592
1649
- #: bbp-admin/bbp-tools.php:699 bbp-admin/bbp-tools.php:754
 
1650
  msgid "Failed!"
1651
  msgstr ""
1652
 
1653
- #: bbp-admin/bbp-tools.php:221 bbp-admin/bbp-tools.php:265
1654
- #: bbp-admin/bbp-tools.php:292 bbp-admin/bbp-tools.php:327
1655
- #: bbp-admin/bbp-tools.php:362 bbp-admin/bbp-tools.php:409
1656
- #: bbp-admin/bbp-tools.php:456 bbp-admin/bbp-tools.php:516
1657
- #: bbp-admin/bbp-tools.php:575 bbp-admin/bbp-tools.php:682
1658
- #: bbp-admin/bbp-tools.php:737 bbp-admin/bbp-tools.php:783
 
1659
  msgid "Complete!"
1660
  msgstr ""
1661
 
1662
- #: bbp-admin/bbp-tools.php:238
1663
  msgid "Counting the number of voices in each topic&hellip; %s"
1664
  msgstr ""
1665
 
1666
- #: bbp-admin/bbp-tools.php:281
1667
  msgid ""
1668
  "Counting the number of spammed and trashed replies in each topic&hellip; %s"
1669
  msgstr ""
1670
 
1671
- #: bbp-admin/bbp-tools.php:311
1672
  msgid "Counting the number of topics in each forum&hellip; %s"
1673
  msgstr ""
1674
 
1675
- #: bbp-admin/bbp-tools.php:346
1676
  msgid "Counting the number of replies in each forum&hellip; %s"
1677
  msgstr ""
1678
 
1679
- #: bbp-admin/bbp-tools.php:379
1680
  msgid "Counting the number of topics each user has created&hellip; %s"
1681
  msgstr ""
1682
 
1683
- #: bbp-admin/bbp-tools.php:426
1684
  msgid "Counting the number of topics to which each user has replied&hellip; %s"
1685
  msgstr ""
1686
 
1687
- #: bbp-admin/bbp-tools.php:473
1688
  msgid "Removing trashed topics from user favorites&hellip; %s"
1689
  msgstr ""
1690
 
1691
- #: bbp-admin/bbp-tools.php:500 bbp-admin/bbp-tools.php:559
1692
  msgid "Nothing to remove!"
1693
  msgstr ""
1694
 
1695
- #: bbp-admin/bbp-tools.php:533
1696
  msgid "Removing trashed topics from user subscriptions&hellip; %s"
1697
  msgstr ""
1698
 
1699
- #: bbp-admin/bbp-tools.php:591
1700
  msgid "Recomputing latest post in every topic and forum&hellip; %s"
1701
  msgstr ""
1702
 
1703
- #: bbp-admin/bbp-tools.php:698
 
 
 
 
1704
  msgid "Recalculating the forum for each post &hellip; %s"
1705
  msgstr ""
1706
 
1707
- #: bbp-admin/bbp-tools.php:753
1708
  msgid "Recalculating the topic for each post &hellip; %s"
1709
  msgstr ""
1710
 
1711
- #: bbp-admin/bbp-tools.php:807
1712
  msgid ""
1713
  "This will revert your forums back to a brand new installation. This process "
1714
  "cannot be undone. <strong>Backup your database before proceeding</strong>."
1715
  msgstr ""
1716
 
1717
- #: bbp-admin/bbp-tools.php:813
1718
  msgid "The following data will be removed:"
1719
  msgstr ""
1720
 
1721
- #: bbp-admin/bbp-tools.php:815 bbpress.php:478
1722
  msgid "All Forums"
1723
  msgstr ""
1724
 
1725
- #: bbp-admin/bbp-tools.php:816 bbp-includes/bbp-topic-functions.php:3115
1726
  #: bbpress.php:535
1727
  msgid "All Topics"
1728
  msgstr ""
1729
 
1730
- #: bbp-admin/bbp-tools.php:817 bbp-includes/bbp-reply-functions.php:1458
1731
  #: bbpress.php:592
1732
  msgid "All Replies"
1733
  msgstr ""
1734
 
1735
- #: bbp-admin/bbp-tools.php:818
1736
  msgid "All Topic Tags"
1737
  msgstr ""
1738
 
1739
- #: bbp-admin/bbp-tools.php:819
1740
  msgid "Related Meta Data"
1741
  msgstr ""
1742
 
1743
- #: bbp-admin/bbp-tools.php:820
1744
  msgid "Forum Settings"
1745
  msgstr ""
1746
 
1747
- #: bbp-admin/bbp-tools.php:821
1748
  msgid "Forum Activity"
1749
  msgstr ""
1750
 
1751
- #: bbp-admin/bbp-tools.php:822
1752
  msgid "Forum User Roles"
1753
  msgstr ""
1754
 
1755
- #: bbp-admin/bbp-tools.php:823
1756
  msgid "Importer Helper Data"
1757
  msgstr ""
1758
 
1759
- #: bbp-admin/bbp-tools.php:827
1760
  msgid "Are you sure you want to do this?"
1761
  msgstr ""
1762
 
1763
- #: bbp-admin/bbp-tools.php:830
1764
  msgid "Say it ain't so!"
1765
  msgstr ""
1766
 
1767
- #: bbp-admin/bbp-tools.php:831
1768
  msgid "This process cannot be undone."
1769
  msgstr ""
1770
 
1771
- #: bbp-admin/bbp-tools.php:839
1772
  msgid "Reset bbPress"
1773
  msgstr ""
1774
 
1775
- #: bbp-admin/bbp-tools.php:864
1776
  msgid "Failed"
1777
  msgstr ""
1778
 
1779
- #: bbp-admin/bbp-tools.php:865
1780
  msgid "Success!"
1781
  msgstr ""
1782
 
1783
- #: bbp-admin/bbp-tools.php:872
1784
  msgid "Deleting Posts&hellip; %s"
1785
  msgstr ""
1786
 
1787
- #: bbp-admin/bbp-tools.php:885
1788
  msgid "Deleting Post Meta&hellip; %s"
1789
  msgstr ""
1790
 
1791
- #: bbp-admin/bbp-tools.php:898
1792
  msgid "Deleting User Meta&hellip; %s"
1793
  msgstr ""
1794
 
1795
- #: bbp-admin/bbp-tools.php:905
1796
  msgid "Deleting Conversion Table&hellip; %s"
1797
  msgstr ""
1798
 
1799
- #: bbp-admin/bbp-tools.php:917
1800
  msgid "Deleting Settings&hellip; %s"
1801
  msgstr ""
1802
 
1803
- #: bbp-admin/bbp-tools.php:923
1804
  msgid "Deleting Roles and Capabilities&hellip; %s"
1805
  msgstr ""
1806
 
@@ -2206,7 +2216,7 @@ msgid ""
2206
  "\n"
2207
  "-----------\n"
2208
  "\n"
2209
- "You are recieving this email because you subscribed to a forum topic.\n"
2210
  "\n"
2211
  "Login and visit the topic to unsubscribe from these emails."
2212
  msgstr ""
@@ -2232,7 +2242,7 @@ msgstr ""
2232
  #: bbp-includes/bbp-common-template.php:1344
2233
  #: bbp-includes/bbp-common-template.php:1355
2234
  #: bbp-includes/bbp-topic-functions.php:1192
2235
- #: bbp-includes/bbp-topic-functions.php:1515
2236
  #: bbp-theme-compat/bbpress/form-reply.php:29
2237
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:29
2238
  msgid "Reply To: %s"
@@ -2303,27 +2313,27 @@ msgstr ""
2303
  msgid "View: %s"
2304
  msgstr ""
2305
 
2306
- #: bbp-includes/bbp-core-update.php:165
2307
  msgid "General"
2308
  msgstr ""
2309
 
2310
- #: bbp-includes/bbp-core-update.php:166
2311
  msgid "General chit-chat"
2312
  msgstr ""
2313
 
2314
- #: bbp-includes/bbp-core-update.php:167
2315
  msgid "Hello World!"
2316
  msgstr ""
2317
 
2318
- #: bbp-includes/bbp-core-update.php:168
2319
  msgid "I am the first topic in your new forums."
2320
  msgstr ""
2321
 
2322
- #: bbp-includes/bbp-core-update.php:169
2323
  msgid "Re: Hello World!"
2324
  msgstr ""
2325
 
2326
- #: bbp-includes/bbp-core-update.php:170
2327
  msgid "Oh, and this is what a reply looks like."
2328
  msgstr ""
2329
 
@@ -2480,20 +2490,20 @@ msgstr ""
2480
  msgid "%1$s reported this %2$s as not spam"
2481
  msgstr ""
2482
 
2483
- #: bbp-includes/bbp-extend-akismet.php:453
2484
  msgid "Akismet caught this post as spam"
2485
  msgstr ""
2486
 
2487
- #: bbp-includes/bbp-extend-akismet.php:457
2488
- #: bbp-includes/bbp-extend-akismet.php:472
2489
  msgid "Post status was changed to %s"
2490
  msgstr ""
2491
 
2492
- #: bbp-includes/bbp-extend-akismet.php:465
2493
  msgid "Akismet cleared this post"
2494
  msgstr ""
2495
 
2496
- #: bbp-includes/bbp-extend-akismet.php:479
2497
  msgid ""
2498
  "Akismet was unable to check this post (response: %s), will automatically "
2499
  "retry again later."
@@ -2578,9 +2588,9 @@ msgstr ""
2578
  #: bbp-includes/bbp-topic-functions.php:473
2579
  #: bbp-includes/bbp-topic-functions.php:1051
2580
  #: bbp-includes/bbp-topic-functions.php:1353
2581
- #: bbp-includes/bbp-topic-functions.php:1656
2582
- #: bbp-includes/bbp-topic-functions.php:1695
2583
- #: bbp-includes/bbp-topic-functions.php:1752
2584
  #: bbp-includes/bbp-user-functions.php:472
2585
  #: bbp-includes/bbp-user-functions.php:792
2586
  #: bbp-includes/bbp-user-functions.php:919
@@ -2854,7 +2864,7 @@ msgid "All Posts"
2854
  msgstr ""
2855
 
2856
  #: bbp-includes/bbp-reply-functions.php:1498
2857
- #: bbp-includes/bbp-topic-functions.php:3140
2858
  msgid "Replies: %s"
2859
  msgstr ""
2860
 
@@ -2868,19 +2878,19 @@ msgstr ""
2868
 
2869
  #: bbp-includes/bbp-reply-template.php:859
2870
  #: bbp-includes/bbp-topic-template.php:1168
2871
- #: bbp-includes/bbp-user-template.php:162
2872
  msgid "Anonymous"
2873
  msgstr ""
2874
 
2875
  #: bbp-includes/bbp-reply-template.php:960
2876
  #: bbp-includes/bbp-topic-template.php:1273
2877
- #: bbp-includes/bbp-user-template.php:1194
2878
  msgid "View %s's profile"
2879
  msgstr ""
2880
 
2881
  #: bbp-includes/bbp-reply-template.php:960
2882
  #: bbp-includes/bbp-topic-template.php:1273
2883
- #: bbp-includes/bbp-user-template.php:1194
2884
  msgid "Visit %s's website"
2885
  msgstr ""
2886
 
@@ -3063,104 +3073,104 @@ msgid ""
3063
  "destination topic!"
3064
  msgstr ""
3065
 
3066
- #: bbp-includes/bbp-topic-functions.php:1432
3067
  msgid ""
3068
  "<strong>ERROR</strong>: There was a problem converting the reply into the "
3069
  "topic. Please try again."
3070
  msgstr ""
3071
 
3072
- #: bbp-includes/bbp-topic-functions.php:1437
3073
  msgid ""
3074
  "<strong>ERROR</strong>: You do not have the permissions to create new "
3075
  "topics. The reply could not be converted into a topic."
3076
  msgstr ""
3077
 
3078
- #: bbp-includes/bbp-topic-functions.php:1644
3079
  msgid ""
3080
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3081
  "getting the tag: %s"
3082
  msgstr ""
3083
 
3084
- #: bbp-includes/bbp-topic-functions.php:1662
3085
- #: bbp-includes/bbp-topic-functions.php:1701
3086
  msgid ""
3087
  "<strong>ERROR</strong>: You do not have the permissions to edit the topic "
3088
  "tags."
3089
  msgstr ""
3090
 
3091
- #: bbp-includes/bbp-topic-functions.php:1668
3092
- #: bbp-includes/bbp-topic-functions.php:1707
3093
  msgid "<strong>ERROR</strong>: You need to enter a tag name."
3094
  msgstr ""
3095
 
3096
- #: bbp-includes/bbp-topic-functions.php:1678
3097
  msgid ""
3098
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3099
  "updating the tag: %s"
3100
  msgstr ""
3101
 
3102
- #: bbp-includes/bbp-topic-functions.php:1717
3103
- #: bbp-includes/bbp-topic-functions.php:1735
3104
  msgid ""
3105
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3106
  "merging the tags: %s"
3107
  msgstr ""
3108
 
3109
- #: bbp-includes/bbp-topic-functions.php:1726
3110
  msgid ""
3111
  "<strong>ERROR</strong>: The tags which are being merged can not be the same."
3112
  msgstr ""
3113
 
3114
- #: bbp-includes/bbp-topic-functions.php:1758
3115
  msgid ""
3116
  "<strong>ERROR</strong>: You do not have the permissions to delete the topic "
3117
  "tags."
3118
  msgstr ""
3119
 
3120
- #: bbp-includes/bbp-topic-functions.php:1767
3121
  msgid ""
3122
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3123
  "deleting the tag: %s"
3124
  msgstr ""
3125
 
3126
- #: bbp-includes/bbp-topic-functions.php:1896
3127
  msgid "<strong>ERROR:</strong> You do not have the permission to do that."
3128
  msgstr ""
3129
 
3130
- #: bbp-includes/bbp-topic-functions.php:1909
3131
  msgid "<strong>ERROR</strong>: There was a problem closing the topic."
3132
  msgstr ""
3133
 
3134
- #: bbp-includes/bbp-topic-functions.php:1909
3135
  msgid "<strong>ERROR</strong>: There was a problem opening the topic."
3136
  msgstr ""
3137
 
3138
- #: bbp-includes/bbp-topic-functions.php:1920
3139
  msgid "<strong>ERROR</strong>: There was a problem unsticking the topic."
3140
  msgstr ""
3141
 
3142
- #: bbp-includes/bbp-topic-functions.php:1920
3143
  msgid "<strong>ERROR</strong>: There was a problem sticking the topic."
3144
  msgstr ""
3145
 
3146
- #: bbp-includes/bbp-topic-functions.php:1930
3147
  msgid ""
3148
  "<strong>ERROR</strong>: There was a problem unmarking the topic as spam."
3149
  msgstr ""
3150
 
3151
- #: bbp-includes/bbp-topic-functions.php:1930
3152
  msgid "<strong>ERROR</strong>: There was a problem marking the topic as spam."
3153
  msgstr ""
3154
 
3155
- #: bbp-includes/bbp-topic-functions.php:1949
3156
  msgid "<strong>ERROR</strong>: There was a problem trashing the topic."
3157
  msgstr ""
3158
 
3159
- #: bbp-includes/bbp-topic-functions.php:1957
3160
  msgid "<strong>ERROR</strong>: There was a problem untrashing the topic."
3161
  msgstr ""
3162
 
3163
- #: bbp-includes/bbp-topic-functions.php:1965
3164
  msgid "<strong>ERROR</strong>: There was a problem deleting the topic."
3165
  msgstr ""
3166
 
@@ -3282,96 +3292,96 @@ msgstr ""
3282
  msgid "<strong>ERROR</strong>: There was a problem subscribing to that topic!"
3283
  msgstr ""
3284
 
3285
- #: bbp-includes/bbp-user-template.php:437
3286
  msgid "Key Master"
3287
  msgstr ""
3288
 
3289
- #: bbp-includes/bbp-user-template.php:449
3290
  msgid "Guest"
3291
  msgstr ""
3292
 
3293
- #: bbp-includes/bbp-user-template.php:454
3294
- #: bbp-includes/bbp-user-template.php:482
3295
  msgid "Member"
3296
  msgstr ""
3297
 
3298
- #: bbp-includes/bbp-user-template.php:459
3299
  msgid "Moderator"
3300
  msgstr ""
3301
 
3302
- #: bbp-includes/bbp-user-template.php:524
3303
  msgid "Admin"
3304
  msgstr ""
3305
 
3306
- #: bbp-includes/bbp-user-template.php:668
3307
  #: bbp-theme-compat/bbpress-functions.php:256
3308
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:207
3309
  msgid "Add this topic to your favorites"
3310
  msgstr ""
3311
 
3312
- #: bbp-includes/bbp-user-template.php:669
3313
  msgid " (%?%)"
3314
  msgstr ""
3315
 
3316
- #: bbp-includes/bbp-user-template.php:675
3317
  msgid "This topic is one of your %favorites% ["
3318
  msgstr ""
3319
 
3320
- #: bbp-includes/bbp-user-template.php:676
3321
  #: bbp-theme-compat/bbpress-functions.php:255
3322
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:206
3323
  msgid "&times;"
3324
  msgstr ""
3325
 
3326
- #: bbp-includes/bbp-user-template.php:677
3327
  msgid "]"
3328
  msgstr ""
3329
 
3330
- #: bbp-includes/bbp-user-template.php:786
3331
  #: bbp-theme-compat/bbpress-functions.php:265
3332
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:216
3333
  msgid "Subscribe"
3334
  msgstr ""
3335
 
3336
- #: bbp-includes/bbp-user-template.php:787
3337
  #: bbp-theme-compat/bbpress-functions.php:266
3338
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:217
3339
  msgid "Unsubscribe"
3340
  msgstr ""
3341
 
3342
- #: bbp-includes/bbp-user-template.php:853
3343
  msgid "User updated."
3344
  msgstr ""
3345
 
3346
- #: bbp-includes/bbp-user-template.php:878
3347
  msgid "You have super admin privileges."
3348
  msgstr ""
3349
 
3350
- #: bbp-includes/bbp-user-template.php:878
3351
  msgid "This user has super admin privileges."
3352
  msgstr ""
3353
 
3354
- #: bbp-includes/bbp-user-template.php:944
3355
  msgid "&mdash; No role for this site &mdash;"
3356
  msgstr ""
3357
 
3358
- #: bbp-includes/bbp-user-template.php:992
3359
  msgid "You are now logged out."
3360
  msgstr ""
3361
 
3362
- #: bbp-includes/bbp-user-template.php:996
3363
  msgid "New user registration is currently not allowed."
3364
  msgstr ""
3365
 
3366
- #: bbp-includes/bbp-user-template.php:1005
3367
  msgid "Check your e-mail for the confirmation link."
3368
  msgstr ""
3369
 
3370
- #: bbp-includes/bbp-user-template.php:1010
3371
  msgid "Check your e-mail for your new password."
3372
  msgstr ""
3373
 
3374
- #: bbp-includes/bbp-user-template.php:1015
3375
  msgid "Registration complete. Please check your e-mail."
3376
  msgstr ""
3377
 
@@ -3532,9 +3542,7 @@ msgid ""
3532
  msgstr ""
3533
 
3534
  #: bbp-theme-compat/bbpress/form-reply.php:60
3535
- #: bbp-theme-compat/bbpress/form-topic.php:86
3536
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:60
3537
- #: bbp-themes/bbp-twentyten/bbpress/form-topic.php:86
3538
  msgid "Reply:"
3539
  msgstr ""
3540
 
@@ -3849,6 +3857,11 @@ msgstr ""
3849
  msgid "Topic Title (Maximum Length: %d):"
3850
  msgstr ""
3851
 
 
 
 
 
 
3852
  #: bbp-theme-compat/bbpress/form-topic.php:110
3853
  #: bbp-themes/bbp-twentyten/bbpress/form-topic.php:110
3854
  msgid "Topic Tags:"
@@ -4256,10 +4269,6 @@ msgstr ""
4256
  msgid "No replies found in Trash"
4257
  msgstr ""
4258
 
4259
- #: bbpress.php:603
4260
- msgid "Topic:"
4261
- msgstr ""
4262
-
4263
  #: bbpress.php:626
4264
  msgid "bbPress Replies"
4265
  msgstr ""
@@ -4352,9 +4361,9 @@ msgstr ""
4352
  msgid "bbPress"
4353
  msgstr ""
4354
 
4355
- #. #-#-#-#-# plugin.pot (bbPress 2.1) #-#-#-#-#
4356
  #. Plugin URI of the plugin/theme
4357
- #. #-#-#-#-# plugin.pot (bbPress 2.1) #-#-#-#-#
4358
  #. Author URI of the plugin/theme
4359
  msgid "http://bbpress.org"
4360
  msgstr ""
2
  # This file is distributed under the same license as the bbPress package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: bbPress 2.1.1\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/bbpress\n"
7
+ "POT-Creation-Date: 2012-07-23 16:17:43+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
31
  msgstr ""
32
 
33
  #: bbp-admin/bbp-admin.php:183 bbp-admin/bbp-functions.php:199
34
+ #: bbp-admin/bbp-tools.php:855
35
  msgid "Reset Forums"
36
  msgstr ""
37
 
502
  "if there are comments on the forum, you can see them here and moderate them."
503
  msgstr ""
504
 
505
+ #: bbp-admin/bbp-forums.php:423 bbp-admin/bbp-metaboxes.php:50
506
  #: bbp-admin/bbp-metaboxes.php:345 bbp-admin/bbp-metaboxes.php:348
507
  #: bbp-admin/bbp-metaboxes.php:396 bbp-admin/bbp-metaboxes.php:399
508
  #: bbp-admin/bbp-replies.php:616 bbp-admin/bbp-topics.php:680
513
  msgid "Forum"
514
  msgstr ""
515
 
516
+ #: bbp-admin/bbp-forums.php:424 bbp-admin/bbp-settings.php:171
517
  #: bbp-admin/bbp-settings.php:192 bbp-admin/bbp-topics.php:679
518
  #: bbp-includes/bbp-extend-buddypress.php:432
519
  #: bbp-includes/bbp-extend-buddypress.php:1434
526
  msgid "Topics"
527
  msgstr ""
528
 
529
+ #: bbp-admin/bbp-forums.php:425 bbp-admin/bbp-settings.php:179
530
  #: bbp-admin/bbp-settings.php:200 bbp-admin/bbp-topics.php:681
531
  #: bbp-includes/bbp-extend-buddypress.php:433
532
  #: bbp-includes/bbp-forum-template.php:2336
546
  msgid "Replies"
547
  msgstr ""
548
 
549
+ #: bbp-admin/bbp-forums.php:426
550
  #: bbp-theme-compat/bbpress/content-single-topic-lead.php:18
551
  #: bbp-theme-compat/bbpress/content-single-topic-lead.php:90
552
  #: bbp-themes/bbp-twentyten/bbpress/content-single-topic-lead.php:17
553
  msgid "Creator"
554
  msgstr ""
555
 
556
+ #: bbp-admin/bbp-forums.php:427 bbp-admin/bbp-replies.php:619
557
  #: bbp-admin/bbp-topics.php:684
558
  msgid "Created"
559
  msgstr ""
560
 
561
+ #: bbp-admin/bbp-forums.php:428 bbp-admin/bbp-topics.php:685
562
  #: bbp-theme-compat/bbpress/loop-forums.php:22
563
  #: bbp-theme-compat/bbpress/loop-topics.php:22
564
  #: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:21
566
  msgid "Freshness"
567
  msgstr ""
568
 
569
+ #: bbp-admin/bbp-forums.php:465 bbp-admin/bbp-replies.php:727
570
  #: bbp-admin/bbp-topics.php:764
571
  msgid "%1$s <br /> %2$s"
572
  msgstr ""
573
 
574
+ #: bbp-admin/bbp-forums.php:477 bbp-includes/bbp-forum-template.php:541
575
  msgid "No Topics"
576
  msgstr ""
577
 
578
+ #: bbp-admin/bbp-forums.php:543
579
  msgid "Forum updated. <a href=\"%s\">View forum</a>"
580
  msgstr ""
581
 
582
+ #: bbp-admin/bbp-forums.php:546 bbp-admin/bbp-replies.php:899
583
  #: bbp-admin/bbp-topics.php:970
584
  msgid "Custom field updated."
585
  msgstr ""
586
 
587
+ #: bbp-admin/bbp-forums.php:549 bbp-admin/bbp-replies.php:902
588
  #: bbp-admin/bbp-topics.php:973
589
  msgid "Custom field deleted."
590
  msgstr ""
591
 
592
+ #: bbp-admin/bbp-forums.php:552
593
  msgid "Forum updated."
594
  msgstr ""
595
 
596
  #. translators: %s: date and time of the revision
597
+ #: bbp-admin/bbp-forums.php:557
598
  msgid "Forum restored to revision from %s"
599
  msgstr ""
600
 
601
+ #: bbp-admin/bbp-forums.php:561
602
  msgid "Forum created. <a href=\"%s\">View forum</a>"
603
  msgstr ""
604
 
605
+ #: bbp-admin/bbp-forums.php:564
606
  msgid "Forum saved."
607
  msgstr ""
608
 
609
+ #: bbp-admin/bbp-forums.php:567
610
  msgid "Forum submitted. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
611
  msgstr ""
612
 
613
+ #: bbp-admin/bbp-forums.php:570
614
  msgid ""
615
  "Forum scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href=\"%2$s"
616
  "\">Preview forum</a>"
617
  msgstr ""
618
 
619
  #. translators: Publish box date format, see http:php.net/date
620
+ #: bbp-admin/bbp-forums.php:572 bbp-admin/bbp-replies.php:925
621
  #: bbp-admin/bbp-topics.php:996
622
  msgid "M j, Y @ G:i"
623
  msgstr ""
624
 
625
+ #: bbp-admin/bbp-forums.php:577
626
  msgid "Forum draft updated. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
627
  msgstr ""
628
 
1598
  msgstr ""
1599
 
1600
  #: bbp-admin/bbp-tools.php:162
1601
+ msgid "Recalculate private and hidden forums"
1602
  msgstr ""
1603
 
1604
  #: bbp-admin/bbp-tools.php:163
1605
+ msgid "Count topics in each forum"
1606
  msgstr ""
1607
 
1608
  #: bbp-admin/bbp-tools.php:164
1609
+ msgid "Count replies in each forum"
1610
  msgstr ""
1611
 
1612
  #: bbp-admin/bbp-tools.php:165
1613
+ msgid "Count replies in each topic"
1614
  msgstr ""
1615
 
1616
  #: bbp-admin/bbp-tools.php:166
1617
+ msgid "Count voices in each topic"
1618
  msgstr ""
1619
 
1620
  #: bbp-admin/bbp-tools.php:167
1621
+ msgid "Count spammed & trashed replies in each topic"
1622
  msgstr ""
1623
 
1624
  #: bbp-admin/bbp-tools.php:168
1625
+ msgid "Count topics for each user"
1626
  msgstr ""
1627
 
1628
  #: bbp-admin/bbp-tools.php:169
1629
+ msgid "Count replies for each user"
1630
  msgstr ""
1631
 
1632
  #: bbp-admin/bbp-tools.php:170
1633
+ msgid "Remove trashed topics from user favorites"
1634
  msgstr ""
1635
 
1636
  #: bbp-admin/bbp-tools.php:171
1637
+ msgid "Remove trashed topics from user subscriptions"
1638
+ msgstr ""
1639
+
1640
+ #: bbp-admin/bbp-tools.php:172
1641
  msgid "Recalculate last activity in each topic and forum"
1642
  msgstr ""
1643
 
1644
+ #: bbp-admin/bbp-tools.php:195
1645
  msgid "Counting the number of replies in each topic&hellip; %s"
1646
  msgstr ""
1647
 
1648
+ #: bbp-admin/bbp-tools.php:196 bbp-admin/bbp-tools.php:240
1649
+ #: bbp-admin/bbp-tools.php:283 bbp-admin/bbp-tools.php:313
1650
+ #: bbp-admin/bbp-tools.php:348 bbp-admin/bbp-tools.php:381
1651
+ #: bbp-admin/bbp-tools.php:428 bbp-admin/bbp-tools.php:475
1652
+ #: bbp-admin/bbp-tools.php:535 bbp-admin/bbp-tools.php:593
1653
+ #: bbp-admin/bbp-tools.php:701 bbp-admin/bbp-tools.php:748
1654
+ #: bbp-admin/bbp-tools.php:803
1655
  msgid "Failed!"
1656
  msgstr ""
1657
 
1658
+ #: bbp-admin/bbp-tools.php:222 bbp-admin/bbp-tools.php:266
1659
+ #: bbp-admin/bbp-tools.php:293 bbp-admin/bbp-tools.php:328
1660
+ #: bbp-admin/bbp-tools.php:363 bbp-admin/bbp-tools.php:410
1661
+ #: bbp-admin/bbp-tools.php:457 bbp-admin/bbp-tools.php:517
1662
+ #: bbp-admin/bbp-tools.php:576 bbp-admin/bbp-tools.php:683
1663
+ #: bbp-admin/bbp-tools.php:731 bbp-admin/bbp-tools.php:786
1664
+ #: bbp-admin/bbp-tools.php:832
1665
  msgid "Complete!"
1666
  msgstr ""
1667
 
1668
+ #: bbp-admin/bbp-tools.php:239
1669
  msgid "Counting the number of voices in each topic&hellip; %s"
1670
  msgstr ""
1671
 
1672
+ #: bbp-admin/bbp-tools.php:282
1673
  msgid ""
1674
  "Counting the number of spammed and trashed replies in each topic&hellip; %s"
1675
  msgstr ""
1676
 
1677
+ #: bbp-admin/bbp-tools.php:312
1678
  msgid "Counting the number of topics in each forum&hellip; %s"
1679
  msgstr ""
1680
 
1681
+ #: bbp-admin/bbp-tools.php:347
1682
  msgid "Counting the number of replies in each forum&hellip; %s"
1683
  msgstr ""
1684
 
1685
+ #: bbp-admin/bbp-tools.php:380
1686
  msgid "Counting the number of topics each user has created&hellip; %s"
1687
  msgstr ""
1688
 
1689
+ #: bbp-admin/bbp-tools.php:427
1690
  msgid "Counting the number of topics to which each user has replied&hellip; %s"
1691
  msgstr ""
1692
 
1693
+ #: bbp-admin/bbp-tools.php:474
1694
  msgid "Removing trashed topics from user favorites&hellip; %s"
1695
  msgstr ""
1696
 
1697
+ #: bbp-admin/bbp-tools.php:501 bbp-admin/bbp-tools.php:560
1698
  msgid "Nothing to remove!"
1699
  msgstr ""
1700
 
1701
+ #: bbp-admin/bbp-tools.php:534
1702
  msgid "Removing trashed topics from user subscriptions&hellip; %s"
1703
  msgstr ""
1704
 
1705
+ #: bbp-admin/bbp-tools.php:592
1706
  msgid "Recomputing latest post in every topic and forum&hellip; %s"
1707
  msgstr ""
1708
 
1709
+ #: bbp-admin/bbp-tools.php:700
1710
+ msgid "Recalculating forum visibility &hellip; %s"
1711
+ msgstr ""
1712
+
1713
+ #: bbp-admin/bbp-tools.php:747
1714
  msgid "Recalculating the forum for each post &hellip; %s"
1715
  msgstr ""
1716
 
1717
+ #: bbp-admin/bbp-tools.php:802
1718
  msgid "Recalculating the topic for each post &hellip; %s"
1719
  msgstr ""
1720
 
1721
+ #: bbp-admin/bbp-tools.php:856
1722
  msgid ""
1723
  "This will revert your forums back to a brand new installation. This process "
1724
  "cannot be undone. <strong>Backup your database before proceeding</strong>."
1725
  msgstr ""
1726
 
1727
+ #: bbp-admin/bbp-tools.php:862
1728
  msgid "The following data will be removed:"
1729
  msgstr ""
1730
 
1731
+ #: bbp-admin/bbp-tools.php:864 bbpress.php:478
1732
  msgid "All Forums"
1733
  msgstr ""
1734
 
1735
+ #: bbp-admin/bbp-tools.php:865 bbp-includes/bbp-topic-functions.php:3146
1736
  #: bbpress.php:535
1737
  msgid "All Topics"
1738
  msgstr ""
1739
 
1740
+ #: bbp-admin/bbp-tools.php:866 bbp-includes/bbp-reply-functions.php:1458
1741
  #: bbpress.php:592
1742
  msgid "All Replies"
1743
  msgstr ""
1744
 
1745
+ #: bbp-admin/bbp-tools.php:867
1746
  msgid "All Topic Tags"
1747
  msgstr ""
1748
 
1749
+ #: bbp-admin/bbp-tools.php:868
1750
  msgid "Related Meta Data"
1751
  msgstr ""
1752
 
1753
+ #: bbp-admin/bbp-tools.php:869
1754
  msgid "Forum Settings"
1755
  msgstr ""
1756
 
1757
+ #: bbp-admin/bbp-tools.php:870
1758
  msgid "Forum Activity"
1759
  msgstr ""
1760
 
1761
+ #: bbp-admin/bbp-tools.php:871
1762
  msgid "Forum User Roles"
1763
  msgstr ""
1764
 
1765
+ #: bbp-admin/bbp-tools.php:872
1766
  msgid "Importer Helper Data"
1767
  msgstr ""
1768
 
1769
+ #: bbp-admin/bbp-tools.php:876
1770
  msgid "Are you sure you want to do this?"
1771
  msgstr ""
1772
 
1773
+ #: bbp-admin/bbp-tools.php:879
1774
  msgid "Say it ain't so!"
1775
  msgstr ""
1776
 
1777
+ #: bbp-admin/bbp-tools.php:880
1778
  msgid "This process cannot be undone."
1779
  msgstr ""
1780
 
1781
+ #: bbp-admin/bbp-tools.php:888
1782
  msgid "Reset bbPress"
1783
  msgstr ""
1784
 
1785
+ #: bbp-admin/bbp-tools.php:913
1786
  msgid "Failed"
1787
  msgstr ""
1788
 
1789
+ #: bbp-admin/bbp-tools.php:914
1790
  msgid "Success!"
1791
  msgstr ""
1792
 
1793
+ #: bbp-admin/bbp-tools.php:921
1794
  msgid "Deleting Posts&hellip; %s"
1795
  msgstr ""
1796
 
1797
+ #: bbp-admin/bbp-tools.php:934
1798
  msgid "Deleting Post Meta&hellip; %s"
1799
  msgstr ""
1800
 
1801
+ #: bbp-admin/bbp-tools.php:947
1802
  msgid "Deleting User Meta&hellip; %s"
1803
  msgstr ""
1804
 
1805
+ #: bbp-admin/bbp-tools.php:954
1806
  msgid "Deleting Conversion Table&hellip; %s"
1807
  msgstr ""
1808
 
1809
+ #: bbp-admin/bbp-tools.php:966
1810
  msgid "Deleting Settings&hellip; %s"
1811
  msgstr ""
1812
 
1813
+ #: bbp-admin/bbp-tools.php:972
1814
  msgid "Deleting Roles and Capabilities&hellip; %s"
1815
  msgstr ""
1816
 
2216
  "\n"
2217
  "-----------\n"
2218
  "\n"
2219
+ "You are receiving this email because you subscribed to a forum topic.\n"
2220
  "\n"
2221
  "Login and visit the topic to unsubscribe from these emails."
2222
  msgstr ""
2242
  #: bbp-includes/bbp-common-template.php:1344
2243
  #: bbp-includes/bbp-common-template.php:1355
2244
  #: bbp-includes/bbp-topic-functions.php:1192
2245
+ #: bbp-includes/bbp-topic-functions.php:1533
2246
  #: bbp-theme-compat/bbpress/form-reply.php:29
2247
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:29
2248
  msgid "Reply To: %s"
2313
  msgid "View: %s"
2314
  msgstr ""
2315
 
2316
+ #: bbp-includes/bbp-core-update.php:168
2317
  msgid "General"
2318
  msgstr ""
2319
 
2320
+ #: bbp-includes/bbp-core-update.php:169
2321
  msgid "General chit-chat"
2322
  msgstr ""
2323
 
2324
+ #: bbp-includes/bbp-core-update.php:170
2325
  msgid "Hello World!"
2326
  msgstr ""
2327
 
2328
+ #: bbp-includes/bbp-core-update.php:171
2329
  msgid "I am the first topic in your new forums."
2330
  msgstr ""
2331
 
2332
+ #: bbp-includes/bbp-core-update.php:172
2333
  msgid "Re: Hello World!"
2334
  msgstr ""
2335
 
2336
+ #: bbp-includes/bbp-core-update.php:173
2337
  msgid "Oh, and this is what a reply looks like."
2338
  msgstr ""
2339
 
2490
  msgid "%1$s reported this %2$s as not spam"
2491
  msgstr ""
2492
 
2493
+ #: bbp-includes/bbp-extend-akismet.php:456
2494
  msgid "Akismet caught this post as spam"
2495
  msgstr ""
2496
 
2497
+ #: bbp-includes/bbp-extend-akismet.php:460
2498
+ #: bbp-includes/bbp-extend-akismet.php:475
2499
  msgid "Post status was changed to %s"
2500
  msgstr ""
2501
 
2502
+ #: bbp-includes/bbp-extend-akismet.php:468
2503
  msgid "Akismet cleared this post"
2504
  msgstr ""
2505
 
2506
+ #: bbp-includes/bbp-extend-akismet.php:482
2507
  msgid ""
2508
  "Akismet was unable to check this post (response: %s), will automatically "
2509
  "retry again later."
2588
  #: bbp-includes/bbp-topic-functions.php:473
2589
  #: bbp-includes/bbp-topic-functions.php:1051
2590
  #: bbp-includes/bbp-topic-functions.php:1353
2591
+ #: bbp-includes/bbp-topic-functions.php:1687
2592
+ #: bbp-includes/bbp-topic-functions.php:1726
2593
+ #: bbp-includes/bbp-topic-functions.php:1783
2594
  #: bbp-includes/bbp-user-functions.php:472
2595
  #: bbp-includes/bbp-user-functions.php:792
2596
  #: bbp-includes/bbp-user-functions.php:919
2864
  msgstr ""
2865
 
2866
  #: bbp-includes/bbp-reply-functions.php:1498
2867
+ #: bbp-includes/bbp-topic-functions.php:3171
2868
  msgid "Replies: %s"
2869
  msgstr ""
2870
 
2878
 
2879
  #: bbp-includes/bbp-reply-template.php:859
2880
  #: bbp-includes/bbp-topic-template.php:1168
2881
+ #: bbp-includes/bbp-user-template.php:164
2882
  msgid "Anonymous"
2883
  msgstr ""
2884
 
2885
  #: bbp-includes/bbp-reply-template.php:960
2886
  #: bbp-includes/bbp-topic-template.php:1273
2887
+ #: bbp-includes/bbp-user-template.php:1196
2888
  msgid "View %s's profile"
2889
  msgstr ""
2890
 
2891
  #: bbp-includes/bbp-reply-template.php:960
2892
  #: bbp-includes/bbp-topic-template.php:1273
2893
+ #: bbp-includes/bbp-user-template.php:1196
2894
  msgid "Visit %s's website"
2895
  msgstr ""
2896
 
3073
  "destination topic!"
3074
  msgstr ""
3075
 
3076
+ #: bbp-includes/bbp-topic-functions.php:1433
3077
  msgid ""
3078
  "<strong>ERROR</strong>: There was a problem converting the reply into the "
3079
  "topic. Please try again."
3080
  msgstr ""
3081
 
3082
+ #: bbp-includes/bbp-topic-functions.php:1438
3083
  msgid ""
3084
  "<strong>ERROR</strong>: You do not have the permissions to create new "
3085
  "topics. The reply could not be converted into a topic."
3086
  msgstr ""
3087
 
3088
+ #: bbp-includes/bbp-topic-functions.php:1675
3089
  msgid ""
3090
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3091
  "getting the tag: %s"
3092
  msgstr ""
3093
 
3094
+ #: bbp-includes/bbp-topic-functions.php:1693
3095
+ #: bbp-includes/bbp-topic-functions.php:1732
3096
  msgid ""
3097
  "<strong>ERROR</strong>: You do not have the permissions to edit the topic "
3098
  "tags."
3099
  msgstr ""
3100
 
3101
+ #: bbp-includes/bbp-topic-functions.php:1699
3102
+ #: bbp-includes/bbp-topic-functions.php:1738
3103
  msgid "<strong>ERROR</strong>: You need to enter a tag name."
3104
  msgstr ""
3105
 
3106
+ #: bbp-includes/bbp-topic-functions.php:1709
3107
  msgid ""
3108
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3109
  "updating the tag: %s"
3110
  msgstr ""
3111
 
3112
+ #: bbp-includes/bbp-topic-functions.php:1748
3113
+ #: bbp-includes/bbp-topic-functions.php:1766
3114
  msgid ""
3115
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3116
  "merging the tags: %s"
3117
  msgstr ""
3118
 
3119
+ #: bbp-includes/bbp-topic-functions.php:1757
3120
  msgid ""
3121
  "<strong>ERROR</strong>: The tags which are being merged can not be the same."
3122
  msgstr ""
3123
 
3124
+ #: bbp-includes/bbp-topic-functions.php:1789
3125
  msgid ""
3126
  "<strong>ERROR</strong>: You do not have the permissions to delete the topic "
3127
  "tags."
3128
  msgstr ""
3129
 
3130
+ #: bbp-includes/bbp-topic-functions.php:1798
3131
  msgid ""
3132
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3133
  "deleting the tag: %s"
3134
  msgstr ""
3135
 
3136
+ #: bbp-includes/bbp-topic-functions.php:1927
3137
  msgid "<strong>ERROR:</strong> You do not have the permission to do that."
3138
  msgstr ""
3139
 
3140
+ #: bbp-includes/bbp-topic-functions.php:1940
3141
  msgid "<strong>ERROR</strong>: There was a problem closing the topic."
3142
  msgstr ""
3143
 
3144
+ #: bbp-includes/bbp-topic-functions.php:1940
3145
  msgid "<strong>ERROR</strong>: There was a problem opening the topic."
3146
  msgstr ""
3147
 
3148
+ #: bbp-includes/bbp-topic-functions.php:1951
3149
  msgid "<strong>ERROR</strong>: There was a problem unsticking the topic."
3150
  msgstr ""
3151
 
3152
+ #: bbp-includes/bbp-topic-functions.php:1951
3153
  msgid "<strong>ERROR</strong>: There was a problem sticking the topic."
3154
  msgstr ""
3155
 
3156
+ #: bbp-includes/bbp-topic-functions.php:1961
3157
  msgid ""
3158
  "<strong>ERROR</strong>: There was a problem unmarking the topic as spam."
3159
  msgstr ""
3160
 
3161
+ #: bbp-includes/bbp-topic-functions.php:1961
3162
  msgid "<strong>ERROR</strong>: There was a problem marking the topic as spam."
3163
  msgstr ""
3164
 
3165
+ #: bbp-includes/bbp-topic-functions.php:1980
3166
  msgid "<strong>ERROR</strong>: There was a problem trashing the topic."
3167
  msgstr ""
3168
 
3169
+ #: bbp-includes/bbp-topic-functions.php:1988
3170
  msgid "<strong>ERROR</strong>: There was a problem untrashing the topic."
3171
  msgstr ""
3172
 
3173
+ #: bbp-includes/bbp-topic-functions.php:1996
3174
  msgid "<strong>ERROR</strong>: There was a problem deleting the topic."
3175
  msgstr ""
3176
 
3292
  msgid "<strong>ERROR</strong>: There was a problem subscribing to that topic!"
3293
  msgstr ""
3294
 
3295
+ #: bbp-includes/bbp-user-template.php:439
3296
  msgid "Key Master"
3297
  msgstr ""
3298
 
3299
+ #: bbp-includes/bbp-user-template.php:451
3300
  msgid "Guest"
3301
  msgstr ""
3302
 
3303
+ #: bbp-includes/bbp-user-template.php:456
3304
+ #: bbp-includes/bbp-user-template.php:484
3305
  msgid "Member"
3306
  msgstr ""
3307
 
3308
+ #: bbp-includes/bbp-user-template.php:461
3309
  msgid "Moderator"
3310
  msgstr ""
3311
 
3312
+ #: bbp-includes/bbp-user-template.php:526
3313
  msgid "Admin"
3314
  msgstr ""
3315
 
3316
+ #: bbp-includes/bbp-user-template.php:670
3317
  #: bbp-theme-compat/bbpress-functions.php:256
3318
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:207
3319
  msgid "Add this topic to your favorites"
3320
  msgstr ""
3321
 
3322
+ #: bbp-includes/bbp-user-template.php:671
3323
  msgid " (%?%)"
3324
  msgstr ""
3325
 
3326
+ #: bbp-includes/bbp-user-template.php:677
3327
  msgid "This topic is one of your %favorites% ["
3328
  msgstr ""
3329
 
3330
+ #: bbp-includes/bbp-user-template.php:678
3331
  #: bbp-theme-compat/bbpress-functions.php:255
3332
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:206
3333
  msgid "&times;"
3334
  msgstr ""
3335
 
3336
+ #: bbp-includes/bbp-user-template.php:679
3337
  msgid "]"
3338
  msgstr ""
3339
 
3340
+ #: bbp-includes/bbp-user-template.php:788
3341
  #: bbp-theme-compat/bbpress-functions.php:265
3342
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:216
3343
  msgid "Subscribe"
3344
  msgstr ""
3345
 
3346
+ #: bbp-includes/bbp-user-template.php:789
3347
  #: bbp-theme-compat/bbpress-functions.php:266
3348
  #: bbp-themes/bbp-twentyten/bbpress-functions.php:217
3349
  msgid "Unsubscribe"
3350
  msgstr ""
3351
 
3352
+ #: bbp-includes/bbp-user-template.php:855
3353
  msgid "User updated."
3354
  msgstr ""
3355
 
3356
+ #: bbp-includes/bbp-user-template.php:880
3357
  msgid "You have super admin privileges."
3358
  msgstr ""
3359
 
3360
+ #: bbp-includes/bbp-user-template.php:880
3361
  msgid "This user has super admin privileges."
3362
  msgstr ""
3363
 
3364
+ #: bbp-includes/bbp-user-template.php:946
3365
  msgid "&mdash; No role for this site &mdash;"
3366
  msgstr ""
3367
 
3368
+ #: bbp-includes/bbp-user-template.php:994
3369
  msgid "You are now logged out."
3370
  msgstr ""
3371
 
3372
+ #: bbp-includes/bbp-user-template.php:998
3373
  msgid "New user registration is currently not allowed."
3374
  msgstr ""
3375
 
3376
+ #: bbp-includes/bbp-user-template.php:1007
3377
  msgid "Check your e-mail for the confirmation link."
3378
  msgstr ""
3379
 
3380
+ #: bbp-includes/bbp-user-template.php:1012
3381
  msgid "Check your e-mail for your new password."
3382
  msgstr ""
3383
 
3384
+ #: bbp-includes/bbp-user-template.php:1017
3385
  msgid "Registration complete. Please check your e-mail."
3386
  msgstr ""
3387
 
3542
  msgstr ""
3543
 
3544
  #: bbp-theme-compat/bbpress/form-reply.php:60
 
3545
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:60
 
3546
  msgid "Reply:"
3547
  msgstr ""
3548
 
3857
  msgid "Topic Title (Maximum Length: %d):"
3858
  msgstr ""
3859
 
3860
+ #: bbp-theme-compat/bbpress/form-topic.php:86
3861
+ #: bbp-themes/bbp-twentyten/bbpress/form-topic.php:86 bbpress.php:603
3862
+ msgid "Topic:"
3863
+ msgstr ""
3864
+
3865
  #: bbp-theme-compat/bbpress/form-topic.php:110
3866
  #: bbp-themes/bbp-twentyten/bbpress/form-topic.php:110
3867
  msgid "Topic Tags:"
4269
  msgid "No replies found in Trash"
4270
  msgstr ""
4271
 
 
 
 
 
4272
  #: bbpress.php:626
4273
  msgid "bbPress Replies"
4274
  msgstr ""
4361
  msgid "bbPress"
4362
  msgstr ""
4363
 
4364
+ #. #-#-#-#-# plugin.pot (bbPress 2.1.1) #-#-#-#-#
4365
  #. Plugin URI of the plugin/theme
4366
+ #. #-#-#-#-# plugin.pot (bbPress 2.1.1) #-#-#-#-#
4367
  #. Author URI of the plugin/theme
4368
  msgid "http://bbpress.org"
4369
  msgstr ""
bbp-theme-compat/bbpress-functions.php CHANGED
@@ -41,8 +41,8 @@ class BBP_Default extends BBP_Theme_Compat {
41
  *
42
  * @since bbPress (r3732)
43
  *
44
- * @uses BBP_Twenty_Ten::setup_globals()
45
- * @uses BBP_Twenty_Ten::setup_actions()
46
  */
47
  public function __construct() {
48
  $this->setup_globals();
41
  *
42
  * @since bbPress (r3732)
43
  *
44
+ * @uses BBP_Default::setup_globals()
45
+ * @uses BBP_Default::setup_actions()
46
  */
47
  public function __construct() {
48
  $this->setup_globals();
bbp-theme-compat/bbpress/content-single-forum.php CHANGED
@@ -13,6 +13,8 @@
13
 
14
  <?php bbp_breadcrumb(); ?>
15
 
 
 
16
  <?php if ( post_password_required() ) : ?>
17
 
18
  <?php bbp_get_template_part( 'form', 'protected' ); ?>
@@ -47,4 +49,6 @@
47
 
48
  <?php endif; ?>
49
 
 
 
50
  </div>
13
 
14
  <?php bbp_breadcrumb(); ?>
15
 
16
+ <?php do_action( 'bbp_template_before_single_forum' ); ?>
17
+
18
  <?php if ( post_password_required() ) : ?>
19
 
20
  <?php bbp_get_template_part( 'form', 'protected' ); ?>
49
 
50
  <?php endif; ?>
51
 
52
+ <?php do_action( 'bbp_template_after_single_forum' ); ?>
53
+
54
  </div>
bbp-theme-compat/bbpress/form-topic.php CHANGED
@@ -83,7 +83,7 @@
83
  <?php if ( !function_exists( 'wp_editor' ) ) : ?>
84
 
85
  <p>
86
- <label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
87
  <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="60" rows="6"><?php bbp_form_topic_content(); ?></textarea>
88
  </p>
89
 
83
  <?php if ( !function_exists( 'wp_editor' ) ) : ?>
84
 
85
  <p>
86
+ <label for="bbp_topic_content"><?php _e( 'Topic:', 'bbpress' ); ?></label><br />
87
  <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="60" rows="6"><?php bbp_form_topic_content(); ?></textarea>
88
  </p>
89
 
bbp-themes/bbp-twentyten/bbpress/content-single-forum.php CHANGED
@@ -13,6 +13,8 @@
13
 
14
  <?php bbp_breadcrumb(); ?>
15
 
 
 
16
  <?php if ( post_password_required() ) : ?>
17
 
18
  <?php bbp_get_template_part( 'form', 'protected' ); ?>
@@ -47,4 +49,6 @@
47
 
48
  <?php endif; ?>
49
 
 
 
50
  </div>
13
 
14
  <?php bbp_breadcrumb(); ?>
15
 
16
+ <?php do_action( 'bbp_template_before_single_forum' ); ?>
17
+
18
  <?php if ( post_password_required() ) : ?>
19
 
20
  <?php bbp_get_template_part( 'form', 'protected' ); ?>
49
 
50
  <?php endif; ?>
51
 
52
+ <?php do_action( 'bbp_template_after_single_forum' ); ?>
53
+
54
  </div>
bbp-themes/bbp-twentyten/bbpress/content-single-topic.php CHANGED
@@ -39,7 +39,7 @@
39
 
40
  <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
41
 
42
- <?php elseif ( bbporg_reply_search_query() ) : ?>
43
 
44
  <?php bbp_get_template_part( 'feedback', 'no-replies' ); ?>
45
 
39
 
40
  <?php bbp_get_template_part( 'pagination', 'replies' ); ?>
41
 
42
+ <?php else : ?>
43
 
44
  <?php bbp_get_template_part( 'feedback', 'no-replies' ); ?>
45
 
bbp-themes/bbp-twentyten/bbpress/form-topic.php CHANGED
@@ -83,7 +83,7 @@
83
  <?php if ( !function_exists( 'wp_editor' ) ) : ?>
84
 
85
  <p>
86
- <label for="bbp_reply_content"><?php _e( 'Reply:', 'bbpress' ); ?></label><br />
87
  <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="60" rows="6"><?php bbp_form_topic_content(); ?></textarea>
88
  </p>
89
 
83
  <?php if ( !function_exists( 'wp_editor' ) ) : ?>
84
 
85
  <p>
86
+ <label for="bbp_topic_content"><?php _e( 'Topic:', 'bbpress' ); ?></label><br />
87
  <textarea id="bbp_topic_content" tabindex="<?php bbp_tab_index(); ?>" name="bbp_topic_content" cols="60" rows="6"><?php bbp_form_topic_content(); ?></textarea>
88
  </p>
89
 
bbpress.php CHANGED
@@ -5,7 +5,7 @@
5
  *
6
  * bbPress is forum software with a twist from the creators of WordPress.
7
  *
8
- * $Id: bbpress.php 4073 2012-07-08 11:06:00Z johnjamesjacoby $
9
  *
10
  * @package bbPress
11
  * @subpackage Main
@@ -17,7 +17,7 @@
17
  * Description: bbPress is forum software with a twist from the creators of WordPress.
18
  * Author: The bbPress Community
19
  * Author URI: http://bbpress.org
20
- * Version: 2.1
21
  * Text Domain: bbpress
22
  * Domain Path: /bbp-languages/
23
  */
@@ -173,8 +173,8 @@ final class bbPress {
173
 
174
  /** Versions **********************************************************/
175
 
176
- $this->version = '2.1'; // bbPress version
177
- $this->db_version = '210'; // bbPress DB version
178
 
179
  /** Paths *************************************************************/
180
 
5
  *
6
  * bbPress is forum software with a twist from the creators of WordPress.
7
  *
8
+ * $Id: bbpress.php 4110 2012-07-23 16:06:47Z johnjamesjacoby $
9
  *
10
  * @package bbPress
11
  * @subpackage Main
17
  * Description: bbPress is forum software with a twist from the creators of WordPress.
18
  * Author: The bbPress Community
19
  * Author URI: http://bbpress.org
20
+ * Version: 2.1.1
21
  * Text Domain: bbpress
22
  * Domain Path: /bbp-languages/
23
  */
173
 
174
  /** Versions **********************************************************/
175
 
176
+ $this->version = '2.1.1'; // bbPress version
177
+ $this->db_version = '211'; // bbPress DB version
178
 
179
  /** Paths *************************************************************/
180
 
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: matt, johnjamesjacoby
3
  Tags: forums, discussion, support, theme, akismet, multisite
4
  Requires at least: 3.4
5
  Tested up to: 3.4
6
- Stable tag: 2.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -26,6 +26,15 @@ We're keeping things as small and light as possible while still allowing for gre
26
 
27
  == Changelog ==
28
 
 
 
 
 
 
 
 
 
 
29
  = 2.1 =
30
  * WordPress 3.4 compatibility
31
  * Deprecate $bbp global, use bbpress() singleton
3
  Tags: forums, discussion, support, theme, akismet, multisite
4
  Requires at least: 3.4
5
  Tested up to: 3.4
6
+ Stable tag: 2.1.1
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
26
 
27
  == Changelog ==
28
 
29
+ = 2.1.1 =
30
+ * Fixed Invision, phpBB, and vBulletin importers
31
+ * Fixed private/hidden forum bugs
32
+ * Fixed topic split meta values
33
+ * Fixed theme compatibility logic error
34
+ * Fixed role mask issues for shared user installs
35
+ * Fixed missing function cruft
36
+ * Fixed missing filter on displayed user fields
37
+
38
  = 2.1 =
39
  * WordPress 3.4 compatibility
40
  * Deprecate $bbp global, use bbpress() singleton