bbPress - Version 2.1-rc4

Version Description

Download this release

Release Info

Developer johnjamesjacoby
Plugin Icon 128x128 bbPress
Version 2.1-rc4
Comparing to
See all releases

Code changes from version 2.1-rc3 to 2.1-rc4

bbp-admin/bbp-forums.php CHANGED
@@ -125,7 +125,7 @@ class BBP_Forums_Admin {
125
  'id' => 'screen-content',
126
  'title' => __( 'Screen Content', 'bbpress' ),
127
  'content' =>
128
- '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:' ) . '</p>' .
129
  '<ul>' .
130
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
131
  '<li>' . __( 'You can filter the list of replies by forum status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
@@ -160,7 +160,7 @@ class BBP_Forums_Admin {
160
 
161
  // Help Sidebar
162
  $current_screen->set_help_sidebar(
163
- '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
164
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
165
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
166
  );
@@ -537,7 +537,7 @@ class BBP_Forums_Admin {
537
  0 => '', // Left empty on purpose
538
 
539
  // Updated
540
- 1 => sprintf( __( 'Forum updated. <a href="%s">View forum</a>' ), $forum_url ),
541
 
542
  // Custom field updated
543
  2 => __( 'Custom field updated.', 'bbpress' ),
@@ -566,7 +566,7 @@ class BBP_Forums_Admin {
566
  // Forum scheduled
567
  9 => sprintf( __( 'Forum scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview forum</a>', 'bbpress' ),
568
  // translators: Publish box date format, see http://php.net/date
569
- date_i18n( __( 'M j, Y @ G:i' ),
570
  strtotime( $post_date ) ),
571
  $forum_url ),
572
 
125
  'id' => 'screen-content',
126
  'title' => __( 'Screen Content', 'bbpress' ),
127
  'content' =>
128
+ '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:', 'bbpress' ) . '</p>' .
129
  '<ul>' .
130
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
131
  '<li>' . __( 'You can filter the list of replies by forum status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
160
 
161
  // Help Sidebar
162
  $current_screen->set_help_sidebar(
163
+ '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
164
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
165
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
166
  );
537
  0 => '', // Left empty on purpose
538
 
539
  // Updated
540
+ 1 => sprintf( __( 'Forum updated. <a href="%s">View forum</a>', 'bbpress' ), $forum_url ),
541
 
542
  // Custom field updated
543
  2 => __( 'Custom field updated.', 'bbpress' ),
566
  // Forum scheduled
567
  9 => sprintf( __( 'Forum scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview forum</a>', 'bbpress' ),
568
  // translators: Publish box date format, see http://php.net/date
569
+ date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
570
  strtotime( $post_date ) ),
571
  $forum_url ),
572
 
bbp-admin/bbp-replies.php CHANGED
@@ -137,7 +137,7 @@ class BBP_Replies_Admin {
137
  'id' => 'screen-content',
138
  'title' => __( 'Screen Content', 'bbpress' ),
139
  'content' =>
140
- '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:' ) . '</p>' .
141
  '<ul>' .
142
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
143
  '<li>' . __( 'You can filter the list of replies by reply status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
@@ -172,7 +172,7 @@ class BBP_Replies_Admin {
172
 
173
  // Help Sidebar
174
  $current_screen->set_help_sidebar(
175
- '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
176
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
177
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
178
  );
@@ -916,7 +916,7 @@ class BBP_Replies_Admin {
916
  0 => '', // Left empty on purpose
917
 
918
  // Updated
919
- 1 => sprintf( __( 'Reply updated. <a href="%s">View topic</a>' ), $topic_url ),
920
 
921
  // Custom field updated
922
  2 => __( 'Custom field updated.', 'bbpress' ),
@@ -945,7 +945,7 @@ class BBP_Replies_Admin {
945
  // Reply scheduled
946
  9 => sprintf( __( 'Reply scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
947
  // translators: Publish box date format, see http://php.net/date
948
- date_i18n( __( 'M j, Y @ G:i' ),
949
  strtotime( $post_date ) ),
950
  $topic_url ),
951
 
137
  'id' => 'screen-content',
138
  'title' => __( 'Screen Content', 'bbpress' ),
139
  'content' =>
140
+ '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:', 'bbpress' ) . '</p>' .
141
  '<ul>' .
142
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
143
  '<li>' . __( 'You can filter the list of replies by reply status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
172
 
173
  // Help Sidebar
174
  $current_screen->set_help_sidebar(
175
+ '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
176
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
177
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
178
  );
916
  0 => '', // Left empty on purpose
917
 
918
  // Updated
919
+ 1 => sprintf( __( 'Reply updated. <a href="%s">View topic</a>', 'bbpress' ), $topic_url ),
920
 
921
  // Custom field updated
922
  2 => __( 'Custom field updated.', 'bbpress' ),
945
  // Reply scheduled
946
  9 => sprintf( __( 'Reply scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
947
  // translators: Publish box date format, see http://php.net/date
948
+ date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
949
  strtotime( $post_date ) ),
950
  $topic_url ),
951
 
bbp-admin/bbp-settings.php CHANGED
@@ -1347,17 +1347,17 @@ function bbp_form_slug_conflict_check( $slug, $default ) {
1347
  /** WordPress Core ****************************************************/
1348
 
1349
  // Core Post Types
1350
- 'post_base' => array( 'name' => __( 'Posts' ), 'default' => 'post', 'context' => 'WordPress' ),
1351
- 'page_base' => array( 'name' => __( 'Pages' ), 'default' => 'page', 'context' => 'WordPress' ),
1352
- 'revision_base' => array( 'name' => __( 'Revisions' ), 'default' => 'revision', 'context' => 'WordPress' ),
1353
- 'attachment_base' => array( 'name' => __( 'Attachments' ), 'default' => 'attachment', 'context' => 'WordPress' ),
1354
- 'nav_menu_base' => array( 'name' => __( 'Menus' ), 'default' => 'nav_menu_item', 'context' => 'WordPress' ),
1355
 
1356
  // Post Tags
1357
- 'tag_base' => array( 'name' => __( 'Tag base' ), 'default' => 'tag', 'context' => 'WordPress' ),
1358
 
1359
  // Post Categories
1360
- 'category_base' => array( 'name' => __( 'Category base' ), 'default' => 'category', 'context' => 'WordPress' ),
1361
 
1362
  /** bbPress Core ******************************************************/
1363
 
1347
  /** WordPress Core ****************************************************/
1348
 
1349
  // Core Post Types
1350
+ 'post_base' => array( 'name' => __( 'Posts', 'bbpress' ), 'default' => 'post', 'context' => 'WordPress' ),
1351
+ 'page_base' => array( 'name' => __( 'Pages', 'bbpress' ), 'default' => 'page', 'context' => 'WordPress' ),
1352
+ 'revision_base' => array( 'name' => __( 'Revisions', 'bbpress' ), 'default' => 'revision', 'context' => 'WordPress' ),
1353
+ 'attachment_base' => array( 'name' => __( 'Attachments', 'bbpress' ), 'default' => 'attachment', 'context' => 'WordPress' ),
1354
+ 'nav_menu_base' => array( 'name' => __( 'Menus', 'bbpress' ), 'default' => 'nav_menu_item', 'context' => 'WordPress' ),
1355
 
1356
  // Post Tags
1357
+ 'tag_base' => array( 'name' => __( 'Tag base', 'bbpress' ), 'default' => 'tag', 'context' => 'WordPress' ),
1358
 
1359
  // Post Categories
1360
+ 'category_base' => array( 'name' => __( 'Category base', 'bbpress' ), 'default' => 'category', 'context' => 'WordPress' ),
1361
 
1362
  /** bbPress Core ******************************************************/
1363
 
bbp-admin/bbp-topics.php CHANGED
@@ -137,7 +137,7 @@ class BBP_Topics_Admin {
137
  'id' => 'screen-content',
138
  'title' => __( 'Screen Content', 'bbpress' ),
139
  'content' =>
140
- '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:' ) . '</p>' .
141
  '<ul>' .
142
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
143
  '<li>' . __( 'You can filter the list of replies by topic status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
@@ -172,7 +172,7 @@ class BBP_Topics_Admin {
172
 
173
  // Help Sidebar
174
  $current_screen->set_help_sidebar(
175
- '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
176
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
177
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
178
  );
@@ -987,7 +987,7 @@ class BBP_Topics_Admin {
987
  0 => '', // Left empty on purpose
988
 
989
  // Updated
990
- 1 => sprintf( __( 'Topic updated. <a href="%s">View topic</a>' ), $topic_url ),
991
 
992
  // Custom field updated
993
  2 => __( 'Custom field updated.', 'bbpress' ),
@@ -1016,7 +1016,7 @@ class BBP_Topics_Admin {
1016
  // Topic scheduled
1017
  9 => sprintf( __( 'Topic scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
1018
  // translators: Publish box date format, see http://php.net/date
1019
- date_i18n( __( 'M j, Y @ G:i' ),
1020
  strtotime( $post_date ) ),
1021
  $topic_url ),
1022
 
137
  'id' => 'screen-content',
138
  'title' => __( 'Screen Content', 'bbpress' ),
139
  'content' =>
140
+ '<p>' . __( 'You can customize the display of this screen&#8217;s contents in a number of ways:', 'bbpress' ) . '</p>' .
141
  '<ul>' .
142
  '<li>' . __( 'You can hide/display columns based on your needs and decide how many replies to list per screen using the Screen Options tab.', 'bbpress' ) . '</li>' .
143
  '<li>' . __( 'You can filter the list of replies by topic status using the text links in the upper left to show All, Published, Draft, or Trashed replies. The default view is to show all replies.', 'bbpress' ) . '</li>' .
172
 
173
  // Help Sidebar
174
  $current_screen->set_help_sidebar(
175
+ '<p><strong>' . __( 'For more information:', 'bbpress' ) . '</strong></p>' .
176
  '<p>' . __( '<a href="http://bbpress.org/documentation/" target="_blank">bbPress Documentation</a>', 'bbpress' ) . '</p>' .
177
  '<p>' . __( '<a href="http://bbpress.org/forums/" target="_blank">bbPress Support Forums</a>', 'bbpress' ) . '</p>'
178
  );
987
  0 => '', // Left empty on purpose
988
 
989
  // Updated
990
+ 1 => sprintf( __( 'Topic updated. <a href="%s">View topic</a>', 'bbpress' ), $topic_url ),
991
 
992
  // Custom field updated
993
  2 => __( 'Custom field updated.', 'bbpress' ),
1016
  // Topic scheduled
1017
  9 => sprintf( __( 'Topic scheduled for: <strong>%1$s</strong>. <a target="_blank" href="%2$s">Preview topic</a>', 'bbpress' ),
1018
  // translators: Publish box date format, see http://php.net/date
1019
+ date_i18n( __( 'M j, Y @ G:i', 'bbpress' ),
1020
  strtotime( $post_date ) ),
1021
  $topic_url ),
1022
 
bbp-includes/bbp-common-functions.php CHANGED
@@ -291,24 +291,19 @@ function bbp_get_view_all( $cap = 'moderate' ) {
291
  function bbp_get_paged() {
292
  global $wp_query;
293
 
294
- // Make sure to not paginate widget queries
295
- if ( !bbp_is_query_name( 'bbp_widget' ) ) {
 
296
 
297
- // Check the query var
298
- if ( get_query_var( 'paged' ) ) {
299
- $paged = get_query_var( 'paged' );
300
-
301
- // Check query paged
302
- } elseif ( !empty( $wp_query->query['paged'] ) ) {
303
- $paged = $wp_query->query['paged'];
304
- }
305
-
306
- // Paged found
307
- if ( !empty( $paged ) ) {
308
- return (int) $paged;
309
- }
310
  }
311
 
 
 
 
 
312
  // Default to first page
313
  return 1;
314
  }
@@ -1660,7 +1655,7 @@ function bbp_set_404() {
1660
  global $wp_query;
1661
 
1662
  if ( ! isset( $wp_query ) ) {
1663
- _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
1664
  return false;
1665
  }
1666
 
291
  function bbp_get_paged() {
292
  global $wp_query;
293
 
294
+ // Check the query var
295
+ if ( get_query_var( 'paged' ) ) {
296
+ $paged = get_query_var( 'paged' );
297
 
298
+ // Check query paged
299
+ } elseif ( !empty( $wp_query->query['paged'] ) ) {
300
+ $paged = $wp_query->query['paged'];
 
 
 
 
 
 
 
 
 
 
301
  }
302
 
303
+ // Paged found
304
+ if ( !empty( $paged ) )
305
+ return (int) $paged;
306
+
307
  // Default to first page
308
  return 1;
309
  }
1655
  global $wp_query;
1656
 
1657
  if ( ! isset( $wp_query ) ) {
1658
+ _doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.', 'bbpress' ), '3.1' );
1659
  return false;
1660
  }
1661
 
bbp-includes/bbp-common-template.php CHANGED
@@ -491,7 +491,7 @@ function bbp_is_single_reply() {
491
  *
492
  * @since bbPress (r2652)
493
  *
494
- * @uses bbp_get_query_name() To get the query name
495
  * @return bool True if it's the favorites page, false if not
496
  */
497
  function bbp_is_favorites() {
@@ -506,7 +506,7 @@ function bbp_is_favorites() {
506
  *
507
  * @since bbPress (r2652)
508
  *
509
- * @uses bbp_get_query_name() To get the query name
510
  * @return bool True if it's the subscriptions page, false if not
511
  */
512
  function bbp_is_subscriptions() {
@@ -522,7 +522,7 @@ function bbp_is_subscriptions() {
522
  *
523
  * @since bbPress (r2688)
524
  *
525
- * @uses bbp_get_query_name() To get the query name
526
  * @return bool True if it's the topics created page, false if not
527
  */
528
  function bbp_is_topics_created() {
@@ -622,7 +622,7 @@ function bbp_is_single_user_edit() {
622
  * @since bbPress (r2789)
623
  *
624
  * @global WP_Query $wp_query To check if WP_Query::bbp_is_view is true
625
- * @uses bbp_get_query_name() To get the query name
626
  * @return bool Is it a view page?
627
  */
628
  function bbp_is_single_view() {
@@ -1642,18 +1642,8 @@ function bbp_view_url( $view = false ) {
1642
  * @uses bbp_get_query_name() Get the query var '_bbp_query_name'
1643
  * @return bool True if match, false if not
1644
  */
1645
- function bbp_is_query_name( $query_name ) {
1646
-
1647
- // No empties
1648
- if ( empty( $query_name ) )
1649
- return false;
1650
-
1651
- // Check if query var matches
1652
- if ( bbp_get_query_name() == $query_name )
1653
- return true;
1654
-
1655
- // No match
1656
- return false;
1657
  }
1658
 
1659
  /**
491
  *
492
  * @since bbPress (r2652)
493
  *
494
+ * @uses bbp_is_query_name() To get the query name
495
  * @return bool True if it's the favorites page, false if not
496
  */
497
  function bbp_is_favorites() {
506
  *
507
  * @since bbPress (r2652)
508
  *
509
+ * @uses bbp_is_query_name() To get the query name
510
  * @return bool True if it's the subscriptions page, false if not
511
  */
512
  function bbp_is_subscriptions() {
522
  *
523
  * @since bbPress (r2688)
524
  *
525
+ * @uses bbp_is_query_name() To get the query name
526
  * @return bool True if it's the topics created page, false if not
527
  */
528
  function bbp_is_topics_created() {
622
  * @since bbPress (r2789)
623
  *
624
  * @global WP_Query $wp_query To check if WP_Query::bbp_is_view is true
625
+ * @uses bbp_is_query_name() To get the query name
626
  * @return bool Is it a view page?
627
  */
628
  function bbp_is_single_view() {
1642
  * @uses bbp_get_query_name() Get the query var '_bbp_query_name'
1643
  * @return bool True if match, false if not
1644
  */
1645
+ function bbp_is_query_name( $name = '' ) {
1646
+ return (bool) ( bbp_get_query_name() == $name );
 
 
 
 
 
 
 
 
 
 
1647
  }
1648
 
1649
  /**
bbp-includes/bbp-core-actions.php CHANGED
@@ -68,6 +68,7 @@ add_action( 'bbp_loaded', 'bbp_setup_option_filters', 10 );
68
  add_action( 'bbp_loaded', 'bbp_setup_user_option_filters', 12 );
69
  add_action( 'bbp_loaded', 'bbp_register_theme_directory', 14 );
70
  add_action( 'bbp_loaded', 'bbp_register_theme_packages', 16 );
 
71
 
72
  /**
73
  * bbp_init - Attached to 'init' above
@@ -76,7 +77,6 @@ add_action( 'bbp_loaded', 'bbp_register_theme_packages', 16 );
76
  * The load order helps to execute code at the correct time.
77
  * v---Load order
78
  */
79
- add_action( 'bbp_init', 'bbp_load_textdomain', 2 );
80
  add_action( 'bbp_init', 'bbp_register_post_types', 10 );
81
  add_action( 'bbp_init', 'bbp_register_post_statuses', 12 );
82
  add_action( 'bbp_init', 'bbp_register_taxonomies', 14 );
@@ -218,6 +218,14 @@ add_action( 'make_spam_user', 'bbp_make_spam_user' );
218
  add_action( 'bbp_new_topic', 'bbp_global_access_auto_role' );
219
  add_action( 'bbp_new_reply', 'bbp_global_access_auto_role' );
220
 
 
 
 
 
 
 
 
 
221
  /**
222
  * bbPress needs to redirect the user around in a few different circumstances:
223
  *
68
  add_action( 'bbp_loaded', 'bbp_setup_user_option_filters', 12 );
69
  add_action( 'bbp_loaded', 'bbp_register_theme_directory', 14 );
70
  add_action( 'bbp_loaded', 'bbp_register_theme_packages', 16 );
71
+ add_action( 'bbp_loaded', 'bbp_load_textdomain', 18 );
72
 
73
  /**
74
  * bbp_init - Attached to 'init' above
77
  * The load order helps to execute code at the correct time.
78
  * v---Load order
79
  */
 
80
  add_action( 'bbp_init', 'bbp_register_post_types', 10 );
81
  add_action( 'bbp_init', 'bbp_register_post_statuses', 12 );
82
  add_action( 'bbp_init', 'bbp_register_taxonomies', 14 );
218
  add_action( 'bbp_new_topic', 'bbp_global_access_auto_role' );
219
  add_action( 'bbp_new_reply', 'bbp_global_access_auto_role' );
220
 
221
+ // Caches
222
+ add_action( 'bbp_new_forum_pre_extras', 'bbp_clean_post_cache' );
223
+ add_action( 'bbp_new_forum_post_extras', 'bbp_clean_post_cache' );
224
+ add_action( 'bbp_new_topic_pre_extras', 'bbp_clean_post_cache' );
225
+ add_action( 'bbp_new_topic_post_extras', 'bbp_clean_post_cache' );
226
+ add_action( 'bbp_new_reply_pre_extras', 'bbp_clean_post_cache' );
227
+ add_action( 'bbp_new_reply_post_extras', 'bbp_clean_post_cache' );
228
+
229
  /**
230
  * bbPress needs to redirect the user around in a few different circumstances:
231
  *
bbp-includes/bbp-core-cache.php CHANGED
@@ -118,3 +118,47 @@ class BBP_Skip_Children {
118
  }
119
  }
120
  new BBP_Skip_Children();
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
118
  }
119
  }
120
  new BBP_Skip_Children();
121
+
122
+ /** General *******************************************************************/
123
+
124
+ /**
125
+ * Will clean a post in the cache.
126
+ *
127
+ * Will call to clean the term object cache associated with the post ID.
128
+ *
129
+ * @since bbPress (r4040)
130
+ *
131
+ * @uses do_action() Calls 'bbp_clean_post_cache' on $id
132
+ * @param object|int $post The post object or ID to remove from the cache
133
+ */
134
+ function bbp_clean_post_cache( $post ) {
135
+ global $wpdb;
136
+
137
+ // Bail if no post
138
+ $post = get_post( $post );
139
+ if ( empty( $post ) )
140
+ return;
141
+
142
+ wp_cache_delete( $post->ID, 'posts' );
143
+ wp_cache_delete( $post->ID, 'post_meta' );
144
+
145
+ clean_object_term_cache( $post->ID, $post->post_type );
146
+
147
+ do_action( 'bbp_clean_post_cache', $post->ID, $post );
148
+
149
+ // Child query types to clean
150
+ $post_types = array( bbp_get_topic_post_type(), bbp_get_forum_post_type(), bbp_get_reply_post_type() );
151
+
152
+ // Loop through query types and clean caches
153
+ foreach ( $post_types as $post_type ) {
154
+ wp_cache_delete( 'bbp_get_forum_' . $post->ID . '_reply_id', 'bbpress' );
155
+ wp_cache_delete( 'bbp_parent_' . $post->ID . '_type_' . $post_type . '_child_last_id', 'bbpress' );
156
+ wp_cache_delete( 'bbp_parent_' . $post->ID . '_type_' . $post_type . '_child_count', 'bbpress' );
157
+ wp_cache_delete( 'bbp_parent_public_' . $post->ID . '_type_' . $post_type . '_child_ids', 'bbpress' );
158
+ wp_cache_delete( 'bbp_parent_all_' . $post->ID . '_type_' . $post_type . '_child_ids', 'bbpress' );
159
+ }
160
+
161
+ // Invalidate parent caches
162
+ if ( $parent = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_type FROM $wpdb->posts WHERE ID = %d", $post->post_parent ) ) )
163
+ bbp_clean_post_cache( $parent );
164
+ }
bbp-includes/bbp-core-widgets.php CHANGED
@@ -366,8 +366,6 @@ class BBP_Forums_Widget extends WP_Widget {
366
  * @uses get_option() To get the forums per page option
367
  * @uses current_user_can() To check if the current user can read
368
  * private() To resety name
369
- * @uses bbp_set_query_name() To set the query name to 'bbp_widget'
370
- * @uses bbp_reset_query_name() To reset the query name
371
  * @uses bbp_has_forums() The main forum loop
372
  * @uses bbp_forums() To check whether there are more forums available
373
  * in the loop
@@ -380,26 +378,25 @@ class BBP_Forums_Widget extends WP_Widget {
380
 
381
  $title = apply_filters( 'bbp_forum_widget_title', $instance['title'] );
382
  $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : '0';
383
-
384
- $forums_query = array(
385
  'post_parent' => $parent_forum,
 
386
  'posts_per_page' => get_option( '_bbp_forums_per_page', 50 ),
387
  'orderby' => 'menu_order',
388
- 'order' => 'ASC'
389
- );
390
-
391
- bbp_set_query_name( 'bbp_widget' );
392
 
393
- if ( bbp_has_forums( $forums_query ) ) :
394
 
395
  echo $before_widget;
396
  echo $before_title . $title . $after_title; ?>
397
 
398
  <ul>
399
 
400
- <?php while ( bbp_forums() ) : bbp_the_forum(); ?>
401
 
402
- <li><a class="bbp-forum-title" href="<?php bbp_forum_permalink(); ?>" title="<?php bbp_forum_title(); ?>"><?php bbp_forum_title(); ?></a></li>
403
 
404
  <?php endwhile; ?>
405
 
@@ -408,8 +405,6 @@ class BBP_Forums_Widget extends WP_Widget {
408
  <?php echo $after_widget;
409
 
410
  endif;
411
-
412
- bbp_reset_query_name();
413
  }
414
 
415
  /**
@@ -515,12 +510,6 @@ class BBP_Topics_Widget extends WP_Widget {
515
  * @param mixed $args
516
  * @param array $instance
517
  * @uses apply_filters() Calls 'bbp_topic_widget_title' with the title
518
- * @uses bbp_set_query_name() To set the query name to 'bbp_widget'
519
- * @uses bbp_reset_query_name() To reset the query name
520
- * @uses bbp_has_topics() The main topic loop
521
- * @uses bbp_topics() To check whether there are more topics available
522
- * in the loop
523
- * @uses bbp_the_topic() Loads up the current topic in the loop
524
  * @uses bbp_topic_permalink() To display the topic permalink
525
  * @uses bbp_topic_title() To display the topic title
526
  * @uses bbp_get_topic_last_active_time() To get the topic last active
@@ -536,83 +525,93 @@ class BBP_Topics_Widget extends WP_Widget {
536
  $max_shown = !empty( $instance['max_shown'] ) ? (int) $instance['max_shown'] : 5;
537
  $show_date = !empty( $instance['show_date'] ) ? 'on' : false;
538
  $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : 'any';
539
- $pop_check = ( $instance['pop_check'] < $max_shown || empty( $instance['pop_check'] ) ) ? -1 : $instance['pop_check'];
540
-
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
541
  // Query defaults
542
- $topics_query = array(
543
- 'author' => 0,
544
- 'post_parent' => $parent_forum,
545
- 'posts_per_page' => $max_shown > $pop_check ? $max_shown : $pop_check,
546
- 'posts_per_page' => $max_shown,
547
- 'show_stickies' => false,
548
- 'order' => 'DESC',
549
- );
550
-
551
- bbp_set_query_name( 'bbp_widget' );
552
 
553
  // Topics exist
554
- if ( bbp_has_topics( $topics_query ) ) :
555
 
556
- // Sort by time
557
- if ( $pop_check < $max_shown ) :
558
-
559
- echo $before_widget;
560
- echo $before_title . $title . $after_title; ?>
561
-
562
- <ul>
563
-
564
- <?php while ( bbp_topics() ) : bbp_the_topic(); ?>
565
-
566
- <li>
567
- <a class="bbp-forum-title" href="<?php bbp_topic_permalink(); ?>" title="<?php bbp_topic_title(); ?>"><?php bbp_topic_title(); ?></a><?php if ( 'on' == $show_date ) bbp_get_topic_last_active_time(); ?>
568
- </li>
569
-
570
- <?php endwhile; ?>
571
-
572
- </ul>
573
-
574
- <?php echo $after_widget;
575
-
576
- // Sort by popularity
577
- elseif ( $pop_check >= $max_shown ) :
578
-
579
- echo $before_widget;
580
- echo $before_title . $title . $after_title;
581
-
582
- while ( bbp_topics() ) {
583
- bbp_the_topic();
584
- $topics[bbp_get_topic_id()] = bbp_get_topic_reply_count();
585
- }
586
 
587
- arsort( $topics );
588
- $topic_count = 1;
589
 
590
- ?>
591
 
592
- <ul>
 
593
 
594
- <?php foreach ( $topics as $topic_id => $topic_reply_count ) : ?>
 
595
 
596
- <li><a class="bbp-topic-title" href="<?php bbp_topic_permalink( $topic_id ); ?>" title="<?php bbp_topic_title( $topic_id ); ?>"><?php bbp_topic_title( $topic_id ); ?></a><?php if ( 'on' == $show_date ) bbp_get_topic_last_active_time( $topic_id ); ?></li>
597
 
598
- <?php
599
 
600
- $topic_count++;
601
 
602
- if ( $topic_count > $max_shown )
603
- break;
604
 
605
- endforeach; ?>
606
 
607
- </ul>
608
 
609
- <?php echo $after_widget;
610
 
611
- endif;
612
  endif;
613
-
614
- bbp_reset_query_name();
615
-
616
  }
617
 
618
  /**
@@ -628,7 +627,7 @@ class BBP_Topics_Widget extends WP_Widget {
628
  $instance['title'] = strip_tags( $new_instance['title'] );
629
  $instance['max_shown'] = strip_tags( $new_instance['max_shown'] );
630
  $instance['show_date'] = strip_tags( $new_instance['show_date'] );
631
- $instance['pop_check'] = strip_tags( $new_instance['pop_check'] );
632
 
633
  return $instance;
634
  }
@@ -646,14 +645,18 @@ class BBP_Topics_Widget extends WP_Widget {
646
  $title = !empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
647
  $max_shown = !empty( $instance['max_shown'] ) ? esc_attr( $instance['max_shown'] ) : '';
648
  $show_date = !empty( $instance['show_date'] ) ? esc_attr( $instance['show_date'] ) : '';
649
- $pop_check = !empty( $instance['pop_check'] ) ? esc_attr( $instance['pop_check'] ) : ''; ?>
650
 
651
  <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></label></p>
652
  <p><label for="<?php echo $this->get_field_id( 'max_shown' ); ?>"><?php _e( 'Maximum topics to show:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_shown' ); ?>" name="<?php echo $this->get_field_name( 'max_shown' ); ?>" type="text" value="<?php echo $max_shown; ?>" /></label></p>
653
  <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:', 'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( 'on', $show_date ); ?> /></label></p>
654
  <p>
655
- <label for="<?php echo $this->get_field_id( 'pop_check' ); ?>"><?php _e( 'Popularity check:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'pop_check' ); ?>" name="<?php echo $this->get_field_name( 'pop_check' ); ?>" type="text" value="<?php echo $pop_check; ?>" /></label>
656
- <br /><small><?php _e( 'Number of topics back to check reply count to determine popularity. A number less than the maximum number of topics to show disables the check.', 'bbpress' ); ?></small>
 
 
 
 
657
  </p>
658
 
659
  <?php
@@ -709,12 +712,6 @@ class BBP_Replies_Widget extends WP_Widget {
709
  * @param mixed $args
710
  * @param array $instance
711
  * @uses apply_filters() Calls 'bbp_reply_widget_title' with the title
712
- * @uses bbp_set_query_name() To set the query name to 'bbp_widget'
713
- * @uses bbp_reset_query_name() To reset the query name
714
- * @uses bbp_has_replies() The main reply loop
715
- * @uses bbp_replies() To check whether there are more replies available
716
- * in the loop
717
- * @uses bbp_the_reply() Loads up the current reply in the loop
718
  * @uses bbp_get_reply_author_link() To get the reply author link
719
  * @uses bbp_get_reply_author() To get the reply author name
720
  * @uses bbp_get_reply_id() To get the reply id
@@ -728,41 +725,39 @@ class BBP_Replies_Widget extends WP_Widget {
728
 
729
  extract( $args );
730
 
731
- $title = apply_filters( 'bbp_replies_widget_title', $instance['title'] );
732
- $max_shown = !empty( $instance['max_shown'] ) ? $instance['max_shown'] : '5';
733
- $show_date = !empty( $instance['show_date'] ) ? 'on' : false;
734
-
735
- // Query defaults
736
- $replies_query = array(
737
  'post_status' => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
738
  'posts_per_page' => $max_shown,
739
- 'order' => 'DESC'
740
- );
741
-
742
- // Set the query name
743
- bbp_set_query_name( 'bbp_widget' );
744
 
745
  // Get replies and display them
746
- if ( bbp_has_replies( $replies_query ) ) :
747
 
748
  echo $before_widget;
749
  echo $before_title . $title . $after_title; ?>
750
 
751
  <ul>
752
 
753
- <?php while ( bbp_replies() ) : bbp_the_reply(); ?>
754
 
755
  <li>
756
-
757
  <?php
758
- $author_link = bbp_get_reply_author_link( array( 'type' => 'both', 'size' => 14 ) );
759
- $reply_link = '<a class="bbp-reply-topic-title" href="' . esc_url( bbp_get_reply_url() ) . '" title="' . bbp_get_reply_excerpt( bbp_get_reply_id(), 50 ) . '">' . bbp_get_reply_topic_title() . '</a>';
 
 
760
 
761
  /* translators: bbpress replies widget: 1: reply author, 2: reply link, 3: reply date, 4: reply time */
762
  if ( $show_date == 'on' ) {
763
- printf( _x( '%1$s on %2$s, %3$s, %4$s', 'widgets', 'bbpress' ), $author_link, $reply_link, get_the_date(), get_the_time() );
764
  } else {
765
- printf( _x( '%1$s on %2$s', 'widgets', 'bbpress' ), $author_link, $reply_link );
766
  }
767
 
768
  ?>
@@ -776,8 +771,6 @@ class BBP_Replies_Widget extends WP_Widget {
776
  <?php echo $after_widget;
777
 
778
  endif;
779
-
780
- bbp_reset_query_name();
781
  }
782
 
783
  /**
366
  * @uses get_option() To get the forums per page option
367
  * @uses current_user_can() To check if the current user can read
368
  * private() To resety name
 
 
369
  * @uses bbp_has_forums() The main forum loop
370
  * @uses bbp_forums() To check whether there are more forums available
371
  * in the loop
378
 
379
  $title = apply_filters( 'bbp_forum_widget_title', $instance['title'] );
380
  $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : '0';
381
+ $widget_query = new WP_Query( array(
 
382
  'post_parent' => $parent_forum,
383
+ 'post_type' => bbp_get_forum_post_type(),
384
  'posts_per_page' => get_option( '_bbp_forums_per_page', 50 ),
385
  'orderby' => 'menu_order',
386
+ 'order' => 'ASC',
387
+ 'meta_query' => array( bbp_exclude_forum_ids( 'meta_query' ) )
388
+ ) );
 
389
 
390
+ if ( $widget_query->have_posts() ) :
391
 
392
  echo $before_widget;
393
  echo $before_title . $title . $after_title; ?>
394
 
395
  <ul>
396
 
397
+ <?php while ( $widget_query->have_posts() ) : $widget_query->the_post(); ?>
398
 
399
+ <li><a class="bbp-forum-title" href="<?php bbp_forum_permalink( $widget_query->post->ID ); ?>" title="<?php bbp_forum_title( $widget_query->post->ID ); ?>"><?php bbp_forum_title( $widget_query->post->ID ); ?></a></li>
400
 
401
  <?php endwhile; ?>
402
 
405
  <?php echo $after_widget;
406
 
407
  endif;
 
 
408
  }
409
 
410
  /**
510
  * @param mixed $args
511
  * @param array $instance
512
  * @uses apply_filters() Calls 'bbp_topic_widget_title' with the title
 
 
 
 
 
 
513
  * @uses bbp_topic_permalink() To display the topic permalink
514
  * @uses bbp_topic_title() To display the topic title
515
  * @uses bbp_get_topic_last_active_time() To get the topic last active
525
  $max_shown = !empty( $instance['max_shown'] ) ? (int) $instance['max_shown'] : 5;
526
  $show_date = !empty( $instance['show_date'] ) ? 'on' : false;
527
  $parent_forum = !empty( $instance['parent_forum'] ) ? $instance['parent_forum'] : 'any';
528
+ $order_by = !empty( $instance['order_by'] ) ? $instance['order_by'] : false;
529
+
530
+ // How do we want to order our results?
531
+ switch ( $order_by ) {
532
+
533
+ // Order by most recent replies
534
+ case 'freshness' :
535
+ $topics_query = array(
536
+ 'author' => 0,
537
+ 'post_type' => bbp_get_topic_post_type(),
538
+ 'post_parent' => $parent_forum,
539
+ 'posts_per_page' => $max_shown,
540
+ 'post_status' => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
541
+ 'show_stickes' => false,
542
+ 'meta_key' => '_bbp_last_active_time',
543
+ 'orderby' => 'meta_value',
544
+ 'order' => 'DESC',
545
+ 'meta_query' => array( bbp_exclude_forum_ids( 'meta_query' ) )
546
+ );
547
+ break;
548
+
549
+ // Order by total number of replies
550
+ case 'popular' :
551
+ $topics_query = array(
552
+ 'author' => 0,
553
+ 'post_type' => bbp_get_topic_post_type(),
554
+ 'post_parent' => $parent_forum,
555
+ 'posts_per_page' => $max_shown,
556
+ 'post_status' => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
557
+ 'show_stickes' => false,
558
+ 'meta_key' => '_bbp_reply_count',
559
+ 'orderby' => 'meta_value',
560
+ 'order' => 'DESC',
561
+ 'meta_query' => array( bbp_exclude_forum_ids( 'meta_query' ) )
562
+ );
563
+ break;
564
+
565
+ // Order by which topic was created most recently
566
+ case 'newness' :
567
+ default :
568
+ $topics_query = array(
569
+ 'author' => 0,
570
+ 'post_type' => bbp_get_topic_post_type(),
571
+ 'post_parent' => $parent_forum,
572
+ 'posts_per_page' => $max_shown,
573
+ 'post_status' => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
574
+ 'show_stickes' => false,
575
+ 'order' => 'DESC',
576
+ 'meta_query' => array( bbp_exclude_forum_ids( 'meta_query' ) )
577
+ );
578
+ break;
579
+ }
580
+
581
  // Query defaults
582
+ $widget_query = new WP_Query( $topics_query );
 
 
 
 
 
 
 
 
 
583
 
584
  // Topics exist
585
+ if ( $widget_query->have_posts() ) :
586
 
587
+ echo $before_widget;
588
+ echo $before_title . $title . $after_title; ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
589
 
590
+ <ul>
 
591
 
592
+ <?php while ( $widget_query->have_posts() ) :
593
 
594
+ $widget_query->the_post();
595
+ $topic_id = bbp_get_topic_id( $widget_query->post->ID ); ?>
596
 
597
+ <li>
598
+ <a class="bbp-forum-title" href="<?php bbp_topic_permalink( $topic_id ); ?>" title="<?php bbp_topic_title( $topic_id ); ?>"><?php bbp_topic_title( $topic_id ); ?></a>
599
 
600
+ <?php if ( 'on' == $show_date ) : ?>
601
 
602
+ <div><?php bbp_topic_last_active_time( $topic_id ); ?></div>
603
 
604
+ <?php endif; ?>
605
 
606
+ </li>
 
607
 
608
+ <?php endwhile; ?>
609
 
610
+ </ul>
611
 
612
+ <?php echo $after_widget;
613
 
 
614
  endif;
 
 
 
615
  }
616
 
617
  /**
627
  $instance['title'] = strip_tags( $new_instance['title'] );
628
  $instance['max_shown'] = strip_tags( $new_instance['max_shown'] );
629
  $instance['show_date'] = strip_tags( $new_instance['show_date'] );
630
+ $instance['order_by'] = strip_tags( $new_instance['order_by'] );
631
 
632
  return $instance;
633
  }
645
  $title = !empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
646
  $max_shown = !empty( $instance['max_shown'] ) ? esc_attr( $instance['max_shown'] ) : '';
647
  $show_date = !empty( $instance['show_date'] ) ? esc_attr( $instance['show_date'] ) : '';
648
+ $order_by = !empty( $instance['order_by'] ) ? esc_attr( $instance['order_by'] ) : ''; ?>
649
 
650
  <p><label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" /></label></p>
651
  <p><label for="<?php echo $this->get_field_id( 'max_shown' ); ?>"><?php _e( 'Maximum topics to show:', 'bbpress' ); ?> <input class="widefat" id="<?php echo $this->get_field_id( 'max_shown' ); ?>" name="<?php echo $this->get_field_name( 'max_shown' ); ?>" type="text" value="<?php echo $max_shown; ?>" /></label></p>
652
  <p><label for="<?php echo $this->get_field_id( 'show_date' ); ?>"><?php _e( 'Show post date:', 'bbpress' ); ?> <input type="checkbox" id="<?php echo $this->get_field_id( 'show_date' ); ?>" name="<?php echo $this->get_field_name( 'show_date' ); ?>" <?php checked( 'on', $show_date ); ?> /></label></p>
653
  <p>
654
+ <label for="<?php echo $this->get_field_id( 'order_by' ); ?>"><?php _e( 'Order By:', 'bbpress' ); ?></label>
655
+ <select name="<?php echo $this->get_field_name( 'order_by' ); ?>" id="<?php echo $this->get_field_name( 'order_by' ); ?>">
656
+ <option <?php selected( $order_by, 'newness' ); ?> value="newness"><?php _e( 'Newest Topics', 'bbpress' ); ?></option>
657
+ <option <?php selected( $order_by, 'popular' ); ?> value="popular"><?php _e( 'Popular Topics', 'bbpress' ); ?></option>
658
+ <option <?php selected( $order_by, 'freshness' ); ?> value="freshness"><?php _e( 'Topics With Recent Replies', 'bbpress' ); ?></option>
659
+ </select>
660
  </p>
661
 
662
  <?php
712
  * @param mixed $args
713
  * @param array $instance
714
  * @uses apply_filters() Calls 'bbp_reply_widget_title' with the title
 
 
 
 
 
 
715
  * @uses bbp_get_reply_author_link() To get the reply author link
716
  * @uses bbp_get_reply_author() To get the reply author name
717
  * @uses bbp_get_reply_id() To get the reply id
725
 
726
  extract( $args );
727
 
728
+ $title = apply_filters( 'bbp_replies_widget_title', $instance['title'] );
729
+ $max_shown = !empty( $instance['max_shown'] ) ? $instance['max_shown'] : '5';
730
+ $show_date = !empty( $instance['show_date'] ) ? 'on' : false;
731
+ $post_types = !empty( $instance['post_type'] ) ? array( bbp_get_topic_post_type(), bbp_get_reply_post_type() ) : bbp_get_reply_post_type();
732
+ $widget_query = new WP_Query( array(
733
+ 'post_type' => $post_types,
734
  'post_status' => join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) ),
735
  'posts_per_page' => $max_shown,
736
+ 'meta_query' => array( bbp_exclude_forum_ids( 'meta_query' ) )
737
+ ) );
 
 
 
738
 
739
  // Get replies and display them
740
+ if ( $widget_query->have_posts() ) :
741
 
742
  echo $before_widget;
743
  echo $before_title . $title . $after_title; ?>
744
 
745
  <ul>
746
 
747
+ <?php while ( $widget_query->have_posts() ) : $widget_query->the_post(); ?>
748
 
749
  <li>
 
750
  <?php
751
+
752
+ $reply_id = bbp_get_reply_id( $widget_query->post->ID );
753
+ $author_link = bbp_get_reply_author_link( array( 'post_id' => $reply_id, 'type' => 'both', 'size' => 14 ) );
754
+ $reply_link = '<a class="bbp-reply-topic-title" href="' . esc_url( bbp_get_reply_url( $reply_id ) ) . '" title="' . bbp_get_reply_excerpt( $reply_id, 50 ) . '">' . bbp_get_reply_topic_title( $reply_id ) . '</a>';
755
 
756
  /* translators: bbpress replies widget: 1: reply author, 2: reply link, 3: reply date, 4: reply time */
757
  if ( $show_date == 'on' ) {
758
+ printf( _x( '%1$s on %2$s %3$s, %4$s', 'widgets', 'bbpress' ), $author_link, $reply_link, '<div>' . get_the_date(), get_the_time() . '</div>' );
759
  } else {
760
+ printf( _x( '%1$s on %2$s', 'widgets', 'bbpress' ), $author_link, $reply_link );
761
  }
762
 
763
  ?>
771
  <?php echo $after_widget;
772
 
773
  endif;
 
 
774
  }
775
 
776
  /**
bbp-includes/bbp-extend-akismet.php CHANGED
@@ -56,10 +56,10 @@ class BBP_Akismet {
56
 
57
  // bbPress functions for spam and ham submissions
58
  $checks['submit'] = array(
59
- 'bbp_spammed_topic' => 10, // Spammed topic
60
- 'bbp_unspammed_topic' => 10, // Unspammed reply
61
- 'bbp_spammed_reply' => 10, // Spammed reply
62
- 'bbp_unspammed_reply' => 10, // Unspammed reply
63
  );
64
 
65
  // Add the checks
@@ -192,7 +192,7 @@ class BBP_Akismet {
192
  /**
193
  * Submit a post for spamming or hamming
194
  *
195
- * @since bbPress ({unknown})
196
  *
197
  * @param int $post_id
198
  *
56
 
57
  // bbPress functions for spam and ham submissions
58
  $checks['submit'] = array(
59
+ 'bbp_spammed_topic' => 10, // Spammed topic
60
+ 'bbp_unspammed_topic' => 10, // Unspammed reply
61
+ 'bbp_spammed_reply' => 10, // Spammed reply
62
+ 'bbp_unspammed_reply' => 10, // Unspammed reply
63
  );
64
 
65
  // Add the checks
192
  /**
193
  * Submit a post for spamming or hamming
194
  *
195
+ * @since bbPress (r3277)
196
  *
197
  * @param int $post_id
198
  *
bbp-includes/bbp-extend-buddypress.php CHANGED
@@ -1032,7 +1032,7 @@ class BBP_Forums_Component extends BP_Component {
1032
  // Adjust title based on view
1033
  if ( bp_is_forums_component() ) {
1034
  if ( bp_is_my_profile() ) {
1035
- $bp->bp_options_title = __( 'Forums', 'buddypress' );
1036
  } else {
1037
  $bp->bp_options_avatar = bp_core_fetch_avatar( array(
1038
  'item_id' => $bp->displayed_user->id,
@@ -1228,12 +1228,12 @@ class BBP_Forums_Group_Extension extends BP_Group_Extension {
1228
 
1229
  $checked = bp_get_new_group_enable_forum() || groups_get_groupmeta( bp_get_new_group_id(), 'forum_id' ); ?>
1230
 
1231
- <h4><?php _e( 'Group Forums', 'buddypress' ); ?></h4>
1232
 
1233
- <p><?php _e( 'Create a discussion forum to allow members of this group to communicate in a structured, bulletin-board style fashion.', 'buddypress' ); ?></p>
1234
 
1235
  <div class="checkbox">
1236
- <label><input type="checkbox" name="bbp-create-group-forum" id="bbp-create-group-forum" value="1"<?php checked( $checked ); ?> /> <?php _e( 'Yes. I want this group to have a forum.', 'buddypress' ); ?></label>
1237
  </div>
1238
 
1239
  <?php
1032
  // Adjust title based on view
1033
  if ( bp_is_forums_component() ) {
1034
  if ( bp_is_my_profile() ) {
1035
+ $bp->bp_options_title = __( 'Forums', 'bbpress' );
1036
  } else {
1037
  $bp->bp_options_avatar = bp_core_fetch_avatar( array(
1038
  'item_id' => $bp->displayed_user->id,
1228
 
1229
  $checked = bp_get_new_group_enable_forum() || groups_get_groupmeta( bp_get_new_group_id(), 'forum_id' ); ?>
1230
 
1231
+ <h4><?php _e( 'Group Forums', 'bbpress' ); ?></h4>
1232
 
1233
+ <p><?php _e( 'Create a discussion forum to allow members of this group to communicate in a structured, bulletin-board style fashion.', 'bbpress' ); ?></p>
1234
 
1235
  <div class="checkbox">
1236
+ <label><input type="checkbox" name="bbp-create-group-forum" id="bbp-create-group-forum" value="1"<?php checked( $checked ); ?> /> <?php _e( 'Yes. I want this group to have a forum.', 'bbpress' ); ?></label>
1237
  </div>
1238
 
1239
  <?php
bbp-includes/bbp-forum-functions.php CHANGED
@@ -228,7 +228,7 @@ function bbp_new_forum_handler() {
228
 
229
  /** Additional Actions (Before Save) **************************************/
230
 
231
- do_action( 'bbp_new_forum_pre_extras' );
232
 
233
  // Bail if errors
234
  if ( bbp_has_errors() )
228
 
229
  /** Additional Actions (Before Save) **************************************/
230
 
231
+ do_action( 'bbp_new_forum_pre_extras', $forum_parent_id );
232
 
233
  // Bail if errors
234
  if ( bbp_has_errors() )
bbp-includes/bbp-reply-functions.php CHANGED
@@ -228,8 +228,8 @@ function bbp_new_reply_handler() {
228
 
229
  /** Additional Actions (Before Save) **************************************/
230
 
231
- do_action( 'bbp_new_reply_pre_extras' );
232
-
233
  // Bail if errors
234
  if ( bbp_has_errors() )
235
  return;
@@ -504,7 +504,10 @@ function bbp_edit_reply_handler() {
504
  'ID' => $reply_id,
505
  'post_title' => $reply_title,
506
  'post_content' => $reply_content,
507
- 'post_status' => $post_status
 
 
 
508
  ) );
509
 
510
  // Insert reply
228
 
229
  /** Additional Actions (Before Save) **************************************/
230
 
231
+ do_action( 'bbp_new_reply_pre_extras', $topic_id, $forum_id );
232
+
233
  // Bail if errors
234
  if ( bbp_has_errors() )
235
  return;
504
  'ID' => $reply_id,
505
  'post_title' => $reply_title,
506
  'post_content' => $reply_content,
507
+ 'post_status' => $post_status,
508
+ 'post_parent' => $reply->post_parent,
509
+ 'post_author' => $reply->post_author,
510
+ 'post_type' => bbp_get_reply_post_type()
511
  ) );
512
 
513
  // Insert reply
bbp-includes/bbp-reply-template.php CHANGED
@@ -70,22 +70,15 @@ function bbp_has_replies( $args = '' ) {
70
  $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
71
 
72
  // Skip topic_id if in the replies widget query
73
- if ( !bbp_is_query_name( 'bbp_widget' ) ) {
74
- $parent_args['meta_query'] = array( array(
75
- 'key' => '_bbp_topic_id',
76
- 'value' => bbp_get_topic_id(),
77
- 'compare' => '='
78
- ) );
79
-
80
- // What are the default allowed statuses (based on user caps)
81
- if ( bbp_get_view_all( 'edit_others_replies' ) ) {
82
- $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
83
- }
84
 
85
- // Prevent debug notice
86
- } else {
87
- $parent_args = array();
88
- }
89
 
90
  // Default query args
91
  $default = array(
@@ -119,7 +112,7 @@ function bbp_has_replies( $args = '' ) {
119
  $bbp->reply_query->paged = $paged;
120
 
121
  // Only add pagination if query returned results
122
- if ( !bbp_is_query_name( 'bbp_widget' ) && (int) $bbp->reply_query->found_posts && (int) $bbp->reply_query->posts_per_page ) {
123
 
124
  // If pretty permalinks are enabled, make our pagination pretty
125
  if ( $wp_rewrite->using_permalinks() ) {
@@ -1285,7 +1278,8 @@ function bbp_reply_position( $reply_id = 0, $topic_id = 0 ) {
1285
  * @uses bbp_get_reply_topic_id() Get the topic id of the reply id
1286
  * @uses bbp_get_topic_reply_count() To get the topic reply count
1287
  * @uses bbp_get_reply_post_type() To get the reply post type
1288
- * @uses bbp_get_public_child_ids() To get the reply ids of the topic id
 
1289
  * @uses bbp_show_lead_topic() Bump the count if lead topic is included
1290
  * @uses apply_filters() Calls 'bbp_get_reply_position' with the reply
1291
  * position, reply id and topic id
@@ -1883,7 +1877,7 @@ function bbp_topic_pagination_links() {
1883
  /**
1884
  * Output the value of reply content field
1885
  *
1886
- * @since bbPress {unknown}
1887
  *
1888
  * @uses bbp_get_form_reply_content() To get value of reply content field
1889
  */
@@ -1893,7 +1887,7 @@ function bbp_form_reply_content() {
1893
  /**
1894
  * Return the value of reply content field
1895
  *
1896
- * @since bbPress {unknown}
1897
  *
1898
  * @uses bbp_is_reply_edit() To check if it's the reply edit page
1899
  * @uses apply_filters() Calls 'bbp_get_form_reply_content' with the content
@@ -1919,7 +1913,7 @@ function bbp_form_reply_content() {
1919
  /**
1920
  * Output checked value of reply log edit field
1921
  *
1922
- * @since bbPress {unknown}
1923
  *
1924
  * @uses bbp_get_form_reply_log_edit() To get the reply log edit value
1925
  */
@@ -1929,7 +1923,7 @@ function bbp_form_reply_log_edit() {
1929
  /**
1930
  * Return checked value of reply log edit field
1931
  *
1932
- * @since bbPress {unknown}
1933
  *
1934
  * @uses apply_filters() Calls 'bbp_get_form_reply_log_edit' with the
1935
  * log edit value
@@ -1951,7 +1945,7 @@ function bbp_form_reply_log_edit() {
1951
  /**
1952
  * Output the value of the reply edit reason
1953
  *
1954
- * @since bbPress {unknown}
1955
  *
1956
  * @uses bbp_get_form_reply_edit_reason() To get the reply edit reason value
1957
  */
@@ -1961,7 +1955,7 @@ function bbp_form_reply_edit_reason() {
1961
  /**
1962
  * Return the value of the reply edit reason
1963
  *
1964
- * @since bbPress {unknown}
1965
  *
1966
  * @uses apply_filters() Calls 'bbp_get_form_reply_edit_reason' with the
1967
  * reply edit reason value
70
  $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
71
 
72
  // Skip topic_id if in the replies widget query
73
+ $parent_args['meta_query'] = array( array(
74
+ 'key' => '_bbp_topic_id',
75
+ 'value' => bbp_get_topic_id(),
76
+ 'compare' => '='
77
+ ) );
 
 
 
 
 
 
78
 
79
+ // What are the default allowed statuses (based on user caps)
80
+ if ( bbp_get_view_all( 'edit_others_replies' ) )
81
+ $default_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
 
82
 
83
  // Default query args
84
  $default = array(
112
  $bbp->reply_query->paged = $paged;
113
 
114
  // Only add pagination if query returned results
115
+ if ( (int) $bbp->reply_query->found_posts && (int) $bbp->reply_query->posts_per_page ) {
116
 
117
  // If pretty permalinks are enabled, make our pagination pretty
118
  if ( $wp_rewrite->using_permalinks() ) {
1278
  * @uses bbp_get_reply_topic_id() Get the topic id of the reply id
1279
  * @uses bbp_get_topic_reply_count() To get the topic reply count
1280
  * @uses bbp_get_reply_post_type() To get the reply post type
1281
+ * @uses bbp_get_reply_position_raw() To get calculate the reply position
1282
+ * @uses bbp_update_reply_position() To update the reply position
1283
  * @uses bbp_show_lead_topic() Bump the count if lead topic is included
1284
  * @uses apply_filters() Calls 'bbp_get_reply_position' with the reply
1285
  * position, reply id and topic id
1877
  /**
1878
  * Output the value of reply content field
1879
  *
1880
+ * @since bbPress (r31301)
1881
  *
1882
  * @uses bbp_get_form_reply_content() To get value of reply content field
1883
  */
1887
  /**
1888
  * Return the value of reply content field
1889
  *
1890
+ * @since bbPress (r31301)
1891
  *
1892
  * @uses bbp_is_reply_edit() To check if it's the reply edit page
1893
  * @uses apply_filters() Calls 'bbp_get_form_reply_content' with the content
1913
  /**
1914
  * Output checked value of reply log edit field
1915
  *
1916
+ * @since bbPress (r31301)
1917
  *
1918
  * @uses bbp_get_form_reply_log_edit() To get the reply log edit value
1919
  */
1923
  /**
1924
  * Return checked value of reply log edit field
1925
  *
1926
+ * @since bbPress (r31301)
1927
  *
1928
  * @uses apply_filters() Calls 'bbp_get_form_reply_log_edit' with the
1929
  * log edit value
1945
  /**
1946
  * Output the value of the reply edit reason
1947
  *
1948
+ * @since bbPress (r31301)
1949
  *
1950
  * @uses bbp_get_form_reply_edit_reason() To get the reply edit reason value
1951
  */
1955
  /**
1956
  * Return the value of the reply edit reason
1957
  *
1958
+ * @since bbPress (r31301)
1959
  *
1960
  * @uses apply_filters() Calls 'bbp_get_form_reply_edit_reason' with the
1961
  * reply edit reason value
bbp-includes/bbp-template-functions.php CHANGED
@@ -194,7 +194,6 @@ function bbp_add_template_locations( $templates = array() ) {
194
  * @uses WP_Query::set_404() To set a 404 status
195
  * @uses current_user_can() To check if the current user can edit the user
196
  * @uses apply_filters() Calls 'enable_edit_any_user_configuration' with true
197
- * @uses bbp_is_query_name() Check if query name is 'bbp_widget'
198
  * @uses bbp_get_view_query_args() To get the view query args
199
  * @uses bbp_get_forum_post_type() To get the forum post type
200
  * @uses bbp_get_topic_post_type() To get the topic post type
@@ -286,9 +285,7 @@ function bbp_parse_query( $posts_query ) {
286
  $posts_query->set( 'bbp_user_id', $user->ID );
287
 
288
  // Set author_name as current user's nicename to get correct posts
289
- if ( !bbp_is_query_name( 'bbp_widget' ) ) {
290
- $posts_query->set( 'author_name', $user->user_nicename );
291
- }
292
 
293
  // Set the displayed user global to this user
294
  bbpress()->displayed_user = $user;
194
  * @uses WP_Query::set_404() To set a 404 status
195
  * @uses current_user_can() To check if the current user can edit the user
196
  * @uses apply_filters() Calls 'enable_edit_any_user_configuration' with true
 
197
  * @uses bbp_get_view_query_args() To get the view query args
198
  * @uses bbp_get_forum_post_type() To get the forum post type
199
  * @uses bbp_get_topic_post_type() To get the topic post type
285
  $posts_query->set( 'bbp_user_id', $user->ID );
286
 
287
  // Set author_name as current user's nicename to get correct posts
288
+ $posts_query->set( 'author_name', $user->user_nicename );
 
 
289
 
290
  // Set the displayed user global to this user
291
  bbpress()->displayed_user = $user;
bbp-includes/bbp-topic-functions.php CHANGED
@@ -258,14 +258,16 @@ function bbp_new_topic_handler() {
258
  $terms = array( bbp_get_topic_tag_tax_id() => $terms );
259
  }
260
 
 
 
 
 
261
  // Bail if errors
262
  if ( bbp_has_errors() )
263
  return;
264
 
265
  /** No Errors *************************************************************/
266
 
267
- do_action( 'bbp_new_topic_pre_extras' );
268
-
269
  // Add the content of the form to $topic_data as an array.
270
  // Just in time manipulation of topic data before being created
271
  $topic_data = apply_filters( 'bbp_new_topic_pre_insert', array(
@@ -573,7 +575,23 @@ function bbp_edit_topic_handler() {
573
 
574
  /** No Errors *************************************************************/
575
 
576
- /** Stickies **********************************************************/
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
577
 
578
  if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
579
 
@@ -598,22 +616,6 @@ function bbp_edit_topic_handler() {
598
  }
599
  }
600
 
601
- /** Update the topic ******************************************************/
602
-
603
- // Add the content of the form to $topic_data as an array
604
- // Just in time manipulation of topic data before being edited
605
- $topic_data = apply_filters( 'bbp_edit_topic_pre_insert', array(
606
- 'ID' => $topic_id,
607
- 'post_title' => $topic_title,
608
- 'post_content' => $topic_content,
609
- 'post_status' => $post_status,
610
- 'post_parent' => $forum_id,
611
- 'tax_input' => $terms,
612
- ) );
613
-
614
- // Insert topic
615
- $topic_id = wp_update_post( $topic_data );
616
-
617
  /** Revisions *************************************************************/
618
 
619
  // Revision Reason
258
  $terms = array( bbp_get_topic_tag_tax_id() => $terms );
259
  }
260
 
261
+ /** Additional Actions (Before Save) **************************************/
262
+
263
+ do_action( 'bbp_new_topic_pre_extras', $forum_id );
264
+
265
  // Bail if errors
266
  if ( bbp_has_errors() )
267
  return;
268
 
269
  /** No Errors *************************************************************/
270
 
 
 
271
  // Add the content of the form to $topic_data as an array.
272
  // Just in time manipulation of topic data before being created
273
  $topic_data = apply_filters( 'bbp_new_topic_pre_insert', array(
575
 
576
  /** No Errors *************************************************************/
577
 
578
+ // Add the content of the form to $topic_data as an array
579
+ // Just in time manipulation of topic data before being edited
580
+ $topic_data = apply_filters( 'bbp_edit_topic_pre_insert', array(
581
+ 'ID' => $topic_id,
582
+ 'post_title' => $topic_title,
583
+ 'post_content' => $topic_content,
584
+ 'post_status' => $post_status,
585
+ 'post_parent' => $forum_id,
586
+ 'post_author' => $topic->post_author,
587
+ 'post_type' => bbp_get_topic_post_type(),
588
+ 'tax_input' => $terms,
589
+ ) );
590
+
591
+ // Insert topic
592
+ $topic_id = wp_update_post( $topic_data );
593
+
594
+ /** Stickies **************************************************************/
595
 
596
  if ( !empty( $_POST['bbp_stick_topic'] ) && in_array( $_POST['bbp_stick_topic'], array( 'stick', 'super', 'unstick' ) ) ) {
597
 
616
  }
617
  }
618
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
619
  /** Revisions *************************************************************/
620
 
621
  // Revision Reason
bbp-includes/bbp-topic-template.php CHANGED
@@ -85,7 +85,7 @@ function bbp_has_topics( $args = '' ) {
85
  global $wp_rewrite;
86
 
87
  // What are the default allowed statuses (based on user caps)
88
- if ( !bbp_is_query_name( 'bbp_widget' ) && bbp_get_view_all() )
89
  $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
90
  else
91
  $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
@@ -110,7 +110,7 @@ function bbp_has_topics( $args = '' ) {
110
  );
111
 
112
  // Maybe query for topic tags
113
- if ( !bbp_is_query_name( 'bbp_widget' ) && bbp_is_topic_tag() ) {
114
  $default['term'] = bbp_get_topic_tag_slug();
115
  $default['taxonomy'] = bbp_get_topic_tag_tax_id();
116
  }
@@ -225,7 +225,7 @@ function bbp_has_topics( $args = '' ) {
225
  $bbp->topic_query->paged = $paged;
226
 
227
  // Only add pagination if query returned results
228
- if ( !bbp_is_query_name( 'bbp_widget' ) && ( (int) $bbp->topic_query->post_count || (int) $bbp->topic_query->found_posts ) && (int) $bbp->topic_query->posts_per_page ) {
229
 
230
  // Limit the number of topics shown based on maximum allowed pages
231
  if ( ( !empty( $max_num_pages ) ) && $bbp->topic_query->found_posts > $bbp->topic_query->max_num_pages * $bbp->topic_query->post_count )
85
  global $wp_rewrite;
86
 
87
  // What are the default allowed statuses (based on user caps)
88
+ if ( bbp_get_view_all() )
89
  $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id(), bbp_get_spam_status_id(), bbp_get_trash_status_id() ) );
90
  else
91
  $default_post_status = join( ',', array( bbp_get_public_status_id(), bbp_get_closed_status_id() ) );
110
  );
111
 
112
  // Maybe query for topic tags
113
+ if ( bbp_is_topic_tag() ) {
114
  $default['term'] = bbp_get_topic_tag_slug();
115
  $default['taxonomy'] = bbp_get_topic_tag_tax_id();
116
  }
225
  $bbp->topic_query->paged = $paged;
226
 
227
  // Only add pagination if query returned results
228
+ if ( ( (int) $bbp->topic_query->post_count || (int) $bbp->topic_query->found_posts ) && (int) $bbp->topic_query->posts_per_page ) {
229
 
230
  // Limit the number of topics shown based on maximum allowed pages
231
  if ( ( !empty( $max_num_pages ) ) && $bbp->topic_query->found_posts > $bbp->topic_query->max_num_pages * $bbp->topic_query->post_count )
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-rc3\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/bbpress\n"
7
- "POT-Creation-Date: 2012-06-28 20:12:03+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -986,37 +986,37 @@ msgid "Mark this reply as spam"
986
  msgstr ""
987
 
988
  #: bbp-admin/bbp-replies.php:780 bbp-admin/bbp-topics.php:852
989
- #: bbp-includes/bbp-reply-template.php:1657
990
  #: bbp-includes/bbp-topic-template.php:2559
991
  msgid "Spam"
992
  msgstr ""
993
 
994
  #: bbp-admin/bbp-replies.php:789 bbp-admin/bbp-topics.php:860
995
- #: bbp-includes/bbp-reply-template.php:1601
996
  #: bbp-includes/bbp-topic-template.php:2317
997
  msgid "Restore this item from the Trash"
998
  msgstr ""
999
 
1000
  #: bbp-admin/bbp-replies.php:789 bbp-admin/bbp-topics.php:860
1001
- #: bbp-includes/bbp-reply-template.php:1587
1002
  #: bbp-includes/bbp-topic-template.php:2303
1003
  msgid "Restore"
1004
  msgstr ""
1005
 
1006
  #: bbp-admin/bbp-replies.php:791 bbp-admin/bbp-topics.php:862
1007
- #: bbp-includes/bbp-reply-template.php:1603
1008
  #: bbp-includes/bbp-topic-template.php:2319
1009
  msgid "Move this item to the Trash"
1010
  msgstr ""
1011
 
1012
  #: bbp-admin/bbp-replies.php:791 bbp-admin/bbp-topics.php:862
1013
- #: bbp-includes/bbp-reply-template.php:1586
1014
  #: bbp-includes/bbp-topic-template.php:2302
1015
  msgid "Trash"
1016
  msgstr ""
1017
 
1018
  #: bbp-admin/bbp-replies.php:795 bbp-admin/bbp-topics.php:866
1019
- #: bbp-includes/bbp-reply-template.php:1607
1020
  #: bbp-includes/bbp-topic-template.php:2323
1021
  msgid "Delete this item permanently"
1022
  msgstr ""
@@ -1718,12 +1718,12 @@ msgstr ""
1718
  msgid "All Forums"
1719
  msgstr ""
1720
 
1721
- #: bbp-admin/bbp-tools.php:816 bbp-includes/bbp-topic-functions.php:3109
1722
  #: bbpress.php:535
1723
  msgid "All Topics"
1724
  msgstr ""
1725
 
1726
- #: bbp-admin/bbp-tools.php:817 bbp-includes/bbp-reply-functions.php:1411
1727
  #: bbpress.php:592
1728
  msgid "All Replies"
1729
  msgstr ""
@@ -2169,30 +2169,30 @@ msgctxt "Separator in time since"
2169
  msgid ","
2170
  msgstr ""
2171
 
2172
- #: bbp-includes/bbp-common-functions.php:493
2173
- #: bbp-includes/bbp-common-functions.php:525
2174
  msgid "Private: %s"
2175
  msgstr ""
2176
 
2177
- #: bbp-includes/bbp-common-functions.php:494
2178
- #: bbp-includes/bbp-common-functions.php:526
2179
  msgid "Spammed: %s"
2180
  msgstr ""
2181
 
2182
- #: bbp-includes/bbp-common-functions.php:495
2183
- #: bbp-includes/bbp-common-functions.php:527
2184
  msgid "Trashed: %s"
2185
  msgstr ""
2186
 
2187
- #: bbp-includes/bbp-common-functions.php:602
2188
  msgid "<strong>ERROR</strong>: Invalid author name submitted!"
2189
  msgstr ""
2190
 
2191
- #: bbp-includes/bbp-common-functions.php:606
2192
  msgid "<strong>ERROR</strong>: Invalid email address submitted!"
2193
  msgstr ""
2194
 
2195
- #: bbp-includes/bbp-common-functions.php:1029
2196
  msgid ""
2197
  "%1$s wrote:\n"
2198
  "\n"
@@ -2207,7 +2207,7 @@ msgid ""
2207
  "Login and visit the topic to unsubscribe from these emails."
2208
  msgstr ""
2209
 
2210
- #: bbp-includes/bbp-common-functions.php:1663
2211
  msgid ""
2212
  "Conditional query tags do not work before the query is run. Before then, "
2213
  "they always return false."
@@ -2227,26 +2227,26 @@ msgstr ""
2227
 
2228
  #: bbp-includes/bbp-common-template.php:1344
2229
  #: bbp-includes/bbp-common-template.php:1355
2230
- #: bbp-includes/bbp-topic-functions.php:1190
2231
- #: bbp-includes/bbp-topic-functions.php:1513
2232
  #: bbp-theme-compat/bbpress/form-reply.php:29
2233
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:29
2234
  msgid "Reply To: %s"
2235
  msgstr ""
2236
 
2237
- #: bbp-includes/bbp-common-template.php:1771
2238
  msgid "Home"
2239
  msgstr ""
2240
 
2241
- #: bbp-includes/bbp-common-template.php:1834
2242
  #: bbp-theme-compat/bbpress/user-details.php:20
2243
  #: bbp-themes/bbp-twentyten/bbpress/user-details.php:20
2244
  msgid "(Edit)"
2245
  msgstr ""
2246
 
2247
- #: bbp-includes/bbp-common-template.php:1838
2248
- #: bbp-includes/bbp-common-template.php:1938
2249
- #: bbp-includes/bbp-common-template.php:2155
2250
  #: bbp-includes/bbp-theme-compatibility.php:543
2251
  #: bbp-includes/bbp-theme-compatibility.php:553
2252
  #: bbp-theme-compat/extras/taxonomy-topic-tag-edit.php:17
@@ -2256,46 +2256,46 @@ msgstr ""
2256
  msgid "Topic Tag: %s"
2257
  msgstr ""
2258
 
2259
- #: bbp-includes/bbp-common-template.php:1842
2260
- #: bbp-includes/bbp-reply-template.php:1466
2261
  #: bbp-includes/bbp-topic-template.php:2181 bbpress.php:481 bbpress.php:538
2262
  #: bbpress.php:595
2263
  msgid "Edit"
2264
  msgstr ""
2265
 
2266
- #: bbp-includes/bbp-common-template.php:1857
2267
  msgid "&rsaquo;"
2268
  msgstr ""
2269
 
2270
- #: bbp-includes/bbp-common-template.php:2089
2271
  msgid "Log Out"
2272
  msgstr ""
2273
 
2274
- #: bbp-includes/bbp-common-template.php:2142
2275
  msgid "Forum: %s"
2276
  msgstr ""
2277
 
2278
- #: bbp-includes/bbp-common-template.php:2146
2279
  msgid "Topic: %s"
2280
  msgstr ""
2281
 
2282
- #: bbp-includes/bbp-common-template.php:2164
2283
  msgid "Your Profile"
2284
  msgstr ""
2285
 
2286
- #: bbp-includes/bbp-common-template.php:2169
2287
  msgid "%s's Profile"
2288
  msgstr ""
2289
 
2290
- #: bbp-includes/bbp-common-template.php:2177
2291
  msgid "Edit Your Profile"
2292
  msgstr ""
2293
 
2294
- #: bbp-includes/bbp-common-template.php:2182
2295
  msgid "Edit %s's Profile"
2296
  msgstr ""
2297
 
2298
- #: bbp-includes/bbp-common-template.php:2189
2299
  msgid "View: %s"
2300
  msgstr ""
2301
 
@@ -2373,8 +2373,8 @@ msgid "Lost Password"
2373
  msgstr ""
2374
 
2375
  #: bbp-includes/bbp-core-widgets.php:182 bbp-includes/bbp-core-widgets.php:308
2376
- #: bbp-includes/bbp-core-widgets.php:450 bbp-includes/bbp-core-widgets.php:651
2377
- #: bbp-includes/bbp-core-widgets.php:814
2378
  msgid "Title:"
2379
  msgstr ""
2380
 
@@ -2402,61 +2402,69 @@ msgstr ""
2402
  msgid "(bbPress) Forums List"
2403
  msgstr ""
2404
 
2405
- #: bbp-includes/bbp-core-widgets.php:456
2406
  msgid "Parent Forum ID:"
2407
  msgstr ""
2408
 
2409
- #: bbp-includes/bbp-core-widgets.php:462
2410
  msgid "\"0\" to show only root - \"any\" to show all"
2411
  msgstr ""
2412
 
2413
- #: bbp-includes/bbp-core-widgets.php:493
2414
  msgid "A list of recent topics, sorted by popularity or freshness."
2415
  msgstr ""
2416
 
2417
- #: bbp-includes/bbp-core-widgets.php:496
2418
  msgid "(bbPress) Recent Topics"
2419
  msgstr ""
2420
 
2421
- #: bbp-includes/bbp-core-widgets.php:652
2422
  msgid "Maximum topics to show:"
2423
  msgstr ""
2424
 
2425
- #: bbp-includes/bbp-core-widgets.php:653 bbp-includes/bbp-core-widgets.php:816
2426
  msgid "Show post date:"
2427
  msgstr ""
2428
 
2429
- #: bbp-includes/bbp-core-widgets.php:655
2430
- msgid "Popularity check:"
2431
  msgstr ""
2432
 
2433
  #: bbp-includes/bbp-core-widgets.php:656
2434
- msgid ""
2435
- "Number of topics back to check reply count to determine popularity. A number "
2436
- "less than the maximum number of topics to show disables the check."
2437
  msgstr ""
2438
 
2439
- #: bbp-includes/bbp-core-widgets.php:687
2440
- msgid "A list of the most recent replies."
 
 
 
 
 
 
2441
  msgstr ""
2442
 
2443
  #: bbp-includes/bbp-core-widgets.php:690
 
 
 
 
2444
  msgid "(bbPress) Recent Replies"
2445
  msgstr ""
2446
 
2447
  #. translators: bbpress replies widget: 1: reply author, 2: reply link, 3:
2448
  #. reply date, 4: reply time
2449
- #: bbp-includes/bbp-core-widgets.php:763
2450
  msgctxt "widgets"
2451
- msgid "%1$s on %2$s, %3$s, %4$s"
2452
  msgstr ""
2453
 
2454
- #: bbp-includes/bbp-core-widgets.php:765
2455
  msgctxt "widgets"
2456
  msgid "%1$s on %2$s"
2457
  msgstr ""
2458
 
2459
- #: bbp-includes/bbp-core-widgets.php:815
2460
  msgid "Maximum replies to show:"
2461
  msgstr ""
2462
 
@@ -2563,12 +2571,12 @@ msgstr ""
2563
  #: bbp-includes/bbp-reply-functions.php:117
2564
  #: bbp-includes/bbp-reply-functions.php:392
2565
  #: bbp-includes/bbp-topic-functions.php:129
2566
- #: bbp-includes/bbp-topic-functions.php:471
2567
- #: bbp-includes/bbp-topic-functions.php:1049
2568
- #: bbp-includes/bbp-topic-functions.php:1351
2569
- #: bbp-includes/bbp-topic-functions.php:1654
2570
- #: bbp-includes/bbp-topic-functions.php:1693
2571
- #: bbp-includes/bbp-topic-functions.php:1750
2572
  #: bbp-includes/bbp-user-functions.php:472
2573
  #: bbp-includes/bbp-user-functions.php:792
2574
  #: bbp-includes/bbp-user-functions.php:919
@@ -2744,7 +2752,7 @@ msgstr ""
2744
 
2745
  #: bbp-includes/bbp-reply-functions.php:168
2746
  #: bbp-includes/bbp-topic-functions.php:199
2747
- #: bbp-includes/bbp-topic-functions.php:485
2748
  msgid "<strong>ERROR</strong>: Forum ID is missing."
2749
  msgstr ""
2750
 
@@ -2768,7 +2776,7 @@ msgid "<strong>ERROR</strong>: Your reply cannot be created at this time."
2768
  msgstr ""
2769
 
2770
  #: bbp-includes/bbp-reply-functions.php:270
2771
- #: bbp-includes/bbp-reply-functions.php:523
2772
  msgid ""
2773
  "<strong>ERROR</strong>: There was a problem adding the tags to the topic."
2774
  msgstr ""
@@ -2812,67 +2820,67 @@ msgstr ""
2812
  msgid "<strong>ERROR</strong>: Your reply cannot be edited at this time."
2813
  msgstr ""
2814
 
2815
- #: bbp-includes/bbp-reply-functions.php:1016
2816
  msgid "<strong>ERROR:</strong> You do not have the permission to do that!"
2817
  msgstr ""
2818
 
2819
- #: bbp-includes/bbp-reply-functions.php:1029
2820
  msgid ""
2821
  "<strong>ERROR</strong>: There was a problem unmarking the reply as spam!"
2822
  msgstr ""
2823
 
2824
- #: bbp-includes/bbp-reply-functions.php:1029
2825
  msgid "<strong>ERROR</strong>: There was a problem marking the reply as spam!"
2826
  msgstr ""
2827
 
2828
- #: bbp-includes/bbp-reply-functions.php:1048
2829
  msgid "<strong>ERROR</strong>: There was a problem trashing the reply!"
2830
  msgstr ""
2831
 
2832
- #: bbp-includes/bbp-reply-functions.php:1056
2833
  msgid "<strong>ERROR</strong>: There was a problem untrashing the reply!"
2834
  msgstr ""
2835
 
2836
- #: bbp-includes/bbp-reply-functions.php:1064
2837
  msgid "<strong>ERROR</strong>: There was a problem deleting the reply!"
2838
  msgstr ""
2839
 
2840
- #: bbp-includes/bbp-reply-functions.php:1409
2841
  msgid "All Posts"
2842
  msgstr ""
2843
 
2844
- #: bbp-includes/bbp-reply-functions.php:1451
2845
- #: bbp-includes/bbp-topic-functions.php:3134
2846
  msgid "Replies: %s"
2847
  msgstr ""
2848
 
2849
- #: bbp-includes/bbp-reply-template.php:589
2850
  msgid "This reply was modified %1$s by %2$s. Reason: %3$s"
2851
  msgstr ""
2852
 
2853
- #: bbp-includes/bbp-reply-template.php:591
2854
  msgid "This reply was modified %1$s by %2$s."
2855
  msgstr ""
2856
 
2857
- #: bbp-includes/bbp-reply-template.php:872
2858
  #: bbp-includes/bbp-topic-template.php:1168
2859
  #: bbp-includes/bbp-user-template.php:162
2860
  msgid "Anonymous"
2861
  msgstr ""
2862
 
2863
- #: bbp-includes/bbp-reply-template.php:973
2864
  #: bbp-includes/bbp-topic-template.php:1273
2865
  #: bbp-includes/bbp-user-template.php:1194
2866
  msgid "View %s's profile"
2867
  msgstr ""
2868
 
2869
- #: bbp-includes/bbp-reply-template.php:973
2870
  #: bbp-includes/bbp-topic-template.php:1273
2871
  #: bbp-includes/bbp-user-template.php:1194
2872
  msgid "Visit %s's website"
2873
  msgstr ""
2874
 
2875
- #: bbp-includes/bbp-reply-template.php:1588
2876
  #: bbp-includes/bbp-topic-template.php:2304
2877
  #: bbp-theme-compat/bbpress/form-topic-tag.php:88
2878
  #: bbp-theme-compat/bbpress/form-topic-tag.php:101
@@ -2881,43 +2889,43 @@ msgstr ""
2881
  msgid "Delete"
2882
  msgstr ""
2883
 
2884
- #: bbp-includes/bbp-reply-template.php:1607
2885
  #: bbp-includes/bbp-topic-template.php:2323
2886
  msgid "Are you sure you want to delete that permanently?"
2887
  msgstr ""
2888
 
2889
- #: bbp-includes/bbp-reply-template.php:1658
2890
  #: bbp-includes/bbp-topic-template.php:2560
2891
  msgid "Unspam"
2892
  msgstr ""
2893
 
2894
- #: bbp-includes/bbp-reply-template.php:1721
2895
  msgid "Split"
2896
  msgstr ""
2897
 
2898
- #: bbp-includes/bbp-reply-template.php:1722
2899
  msgid "Split the topic from this reply"
2900
  msgstr ""
2901
 
2902
- #: bbp-includes/bbp-reply-template.php:1829
2903
  msgid "Viewing %1$s reply"
2904
  msgid_plural "Viewing %1$s replies"
2905
  msgstr[0] ""
2906
  msgstr[1] ""
2907
 
2908
- #: bbp-includes/bbp-reply-template.php:1833
2909
  msgid "Viewing %2$s replies (of %4$s total)"
2910
  msgid_plural "Viewing %1$s replies - %2$s through %3$s (of %4$s total)"
2911
  msgstr[0] ""
2912
  msgstr[1] ""
2913
 
2914
- #: bbp-includes/bbp-reply-template.php:1841
2915
  msgid "Viewing %1$s post"
2916
  msgid_plural "Viewing %1$s posts"
2917
  msgstr[0] ""
2918
  msgstr[1] ""
2919
 
2920
- #: bbp-includes/bbp-reply-template.php:1845
2921
  msgid "Viewing %2$s post (of %4$s total)"
2922
  msgid_plural "Viewing %1$s posts - %2$s through %3$s (of %4$s total)"
2923
  msgstr[0] ""
@@ -2929,12 +2937,12 @@ msgid ""
2929
  msgstr ""
2930
 
2931
  #: bbp-includes/bbp-topic-functions.php:181
2932
- #: bbp-includes/bbp-topic-functions.php:525
2933
  msgid "<strong>ERROR</strong>: Your topic needs a title."
2934
  msgstr ""
2935
 
2936
  #: bbp-includes/bbp-topic-functions.php:193
2937
- #: bbp-includes/bbp-topic-functions.php:537
2938
  msgid "<strong>ERROR</strong>: Your topic cannot be empty."
2939
  msgstr ""
2940
 
@@ -2945,19 +2953,19 @@ msgid ""
2945
  msgstr ""
2946
 
2947
  #: bbp-includes/bbp-topic-functions.php:214
2948
- #: bbp-includes/bbp-topic-functions.php:504
2949
  msgid "<strong>ERROR</strong>: This forum has been closed to new topics."
2950
  msgstr ""
2951
 
2952
  #: bbp-includes/bbp-topic-functions.php:218
2953
- #: bbp-includes/bbp-topic-functions.php:508
2954
  msgid ""
2955
  "<strong>ERROR</strong>: This forum is private and you do not have the "
2956
  "capability to read or create new topics in it."
2957
  msgstr ""
2958
 
2959
  #: bbp-includes/bbp-topic-functions.php:222
2960
- #: bbp-includes/bbp-topic-functions.php:512
2961
  msgid ""
2962
  "<strong>ERROR</strong>: This forum is hidden and you do not have the "
2963
  "capability to read or create new topics in it."
@@ -2973,182 +2981,182 @@ msgstr ""
2973
  msgid "<strong>ERROR</strong>: Your topic cannot be created at this time."
2974
  msgstr ""
2975
 
2976
- #: bbp-includes/bbp-topic-functions.php:436
2977
- #: bbp-includes/bbp-topic-functions.php:1043
2978
  msgid "<strong>ERROR</strong>: Topic ID not found."
2979
  msgstr ""
2980
 
2981
- #: bbp-includes/bbp-topic-functions.php:447
2982
  msgid "<strong>ERROR</strong>: The topic you want to edit was not found."
2983
  msgstr ""
2984
 
2985
- #: bbp-includes/bbp-topic-functions.php:458
2986
  msgid "<strong>ERROR</strong>: You do not have permission to edit that topic."
2987
  msgstr ""
2988
 
2989
- #: bbp-includes/bbp-topic-functions.php:500
2990
  msgid ""
2991
  "<strong>ERROR</strong>: This forum is a category. No topics can be created "
2992
  "in it."
2993
  msgstr ""
2994
 
2995
- #: bbp-includes/bbp-topic-functions.php:542
2996
  msgid "<strong>ERROR</strong>: Your topic cannot be edited at this time."
2997
  msgstr ""
2998
 
2999
- #: bbp-includes/bbp-topic-functions.php:1054
3000
  msgid "<strong>ERROR</strong>: The topic you want to merge was not found."
3001
  msgstr ""
3002
 
3003
- #: bbp-includes/bbp-topic-functions.php:1060
3004
- #: bbp-includes/bbp-topic-functions.php:1357
3005
  msgid ""
3006
  "<strong>ERROR</strong>: You do not have the permissions to edit the source "
3007
  "topic."
3008
  msgstr ""
3009
 
3010
- #: bbp-includes/bbp-topic-functions.php:1068
3011
  msgid "<strong>ERROR</strong>: Destination topic ID not found."
3012
  msgstr ""
3013
 
3014
- #: bbp-includes/bbp-topic-functions.php:1074
3015
  msgid "<strong>ERROR</strong>: The topic you want to merge to was not found."
3016
  msgstr ""
3017
 
3018
- #: bbp-includes/bbp-topic-functions.php:1078
3019
  msgid ""
3020
  "<strong>ERROR</strong>: You do not have the permissions to edit the "
3021
  "destination topic."
3022
  msgstr ""
3023
 
3024
- #: bbp-includes/bbp-topic-functions.php:1330
3025
  msgid "<strong>ERROR</strong>: Reply ID to split the topic from not found!"
3026
  msgstr ""
3027
 
3028
- #: bbp-includes/bbp-topic-functions.php:1338
3029
  msgid "<strong>ERROR</strong>: The reply you want to split from was not found."
3030
  msgstr ""
3031
 
3032
- #: bbp-includes/bbp-topic-functions.php:1347
3033
  msgid "<strong>ERROR</strong>: The topic you want to split was not found."
3034
  msgstr ""
3035
 
3036
- #: bbp-includes/bbp-topic-functions.php:1365
3037
  msgid "<strong>ERROR</strong>: You need to choose a valid split option."
3038
  msgstr ""
3039
 
3040
- #: bbp-includes/bbp-topic-functions.php:1378
3041
  msgid "<strong>ERROR</strong>: Destination topic ID not found!"
3042
  msgstr ""
3043
 
3044
- #: bbp-includes/bbp-topic-functions.php:1387
3045
  msgid "<strong>ERROR</strong>: The topic you want to split to was not found!"
3046
  msgstr ""
3047
 
3048
- #: bbp-includes/bbp-topic-functions.php:1391
3049
  msgid ""
3050
  "<strong>ERROR</strong>: You do not have the permissions to edit the "
3051
  "destination topic!"
3052
  msgstr ""
3053
 
3054
- #: bbp-includes/bbp-topic-functions.php:1430
3055
  msgid ""
3056
  "<strong>ERROR</strong>: There was a problem converting the reply into the "
3057
  "topic. Please try again."
3058
  msgstr ""
3059
 
3060
- #: bbp-includes/bbp-topic-functions.php:1435
3061
  msgid ""
3062
  "<strong>ERROR</strong>: You do not have the permissions to create new "
3063
  "topics. The reply could not be converted into a topic."
3064
  msgstr ""
3065
 
3066
- #: bbp-includes/bbp-topic-functions.php:1642
3067
  msgid ""
3068
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3069
  "getting the tag: %s"
3070
  msgstr ""
3071
 
3072
- #: bbp-includes/bbp-topic-functions.php:1660
3073
- #: bbp-includes/bbp-topic-functions.php:1699
3074
  msgid ""
3075
  "<strong>ERROR</strong>: You do not have the permissions to edit the topic "
3076
  "tags."
3077
  msgstr ""
3078
 
3079
- #: bbp-includes/bbp-topic-functions.php:1666
3080
- #: bbp-includes/bbp-topic-functions.php:1705
3081
  msgid "<strong>ERROR</strong>: You need to enter a tag name."
3082
  msgstr ""
3083
 
3084
- #: bbp-includes/bbp-topic-functions.php:1676
3085
  msgid ""
3086
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3087
  "updating the tag: %s"
3088
  msgstr ""
3089
 
3090
- #: bbp-includes/bbp-topic-functions.php:1715
3091
- #: bbp-includes/bbp-topic-functions.php:1733
3092
  msgid ""
3093
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3094
  "merging the tags: %s"
3095
  msgstr ""
3096
 
3097
- #: bbp-includes/bbp-topic-functions.php:1724
3098
  msgid ""
3099
  "<strong>ERROR</strong>: The tags which are being merged can not be the same."
3100
  msgstr ""
3101
 
3102
- #: bbp-includes/bbp-topic-functions.php:1756
3103
  msgid ""
3104
  "<strong>ERROR</strong>: You do not have the permissions to delete the topic "
3105
  "tags."
3106
  msgstr ""
3107
 
3108
- #: bbp-includes/bbp-topic-functions.php:1765
3109
  msgid ""
3110
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3111
  "deleting the tag: %s"
3112
  msgstr ""
3113
 
3114
- #: bbp-includes/bbp-topic-functions.php:1894
3115
  msgid "<strong>ERROR:</strong> You do not have the permission to do that."
3116
  msgstr ""
3117
 
3118
- #: bbp-includes/bbp-topic-functions.php:1907
3119
  msgid "<strong>ERROR</strong>: There was a problem closing the topic."
3120
  msgstr ""
3121
 
3122
- #: bbp-includes/bbp-topic-functions.php:1907
3123
  msgid "<strong>ERROR</strong>: There was a problem opening the topic."
3124
  msgstr ""
3125
 
3126
- #: bbp-includes/bbp-topic-functions.php:1918
3127
  msgid "<strong>ERROR</strong>: There was a problem unsticking the topic."
3128
  msgstr ""
3129
 
3130
- #: bbp-includes/bbp-topic-functions.php:1918
3131
  msgid "<strong>ERROR</strong>: There was a problem sticking the topic."
3132
  msgstr ""
3133
 
3134
- #: bbp-includes/bbp-topic-functions.php:1928
3135
  msgid ""
3136
  "<strong>ERROR</strong>: There was a problem unmarking the topic as spam."
3137
  msgstr ""
3138
 
3139
- #: bbp-includes/bbp-topic-functions.php:1928
3140
  msgid "<strong>ERROR</strong>: There was a problem marking the topic as spam."
3141
  msgstr ""
3142
 
3143
- #: bbp-includes/bbp-topic-functions.php:1947
3144
  msgid "<strong>ERROR</strong>: There was a problem trashing the topic."
3145
  msgstr ""
3146
 
3147
- #: bbp-includes/bbp-topic-functions.php:1955
3148
  msgid "<strong>ERROR</strong>: There was a problem untrashing the topic."
3149
  msgstr ""
3150
 
3151
- #: bbp-includes/bbp-topic-functions.php:1963
3152
  msgid "<strong>ERROR</strong>: There was a problem deleting the topic."
3153
  msgstr ""
3154
 
@@ -4134,11 +4142,6 @@ msgstr ""
4134
  msgid "Hidden Replies"
4135
  msgstr ""
4136
 
4137
- #: bbp-theme-compat/extras/page-forum-statistics.php:100
4138
- #: bbp-themes/bbp-twentyten/page-forum-statistics.php:99
4139
- msgid "Popular Topics"
4140
- msgstr ""
4141
-
4142
  #: bbp-theme-compat/extras/page-topic-tags.php:22
4143
  #: bbp-themes/bbp-twentyten/page-topic-tags.php:23
4144
  msgid ""
@@ -4345,9 +4348,9 @@ msgstr ""
4345
  msgid "bbPress"
4346
  msgstr ""
4347
 
4348
- #. #-#-#-#-# plugin.pot (bbPress 2.1-rc3) #-#-#-#-#
4349
  #. Plugin URI of the plugin/theme
4350
- #. #-#-#-#-# plugin.pot (bbPress 2.1-rc3) #-#-#-#-#
4351
  #. Author URI of the plugin/theme
4352
  msgid "http://bbpress.org"
4353
  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-rc4\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/bbpress\n"
7
+ "POT-Creation-Date: 2012-07-02 01:04:39+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
986
  msgstr ""
987
 
988
  #: bbp-admin/bbp-replies.php:780 bbp-admin/bbp-topics.php:852
989
+ #: bbp-includes/bbp-reply-template.php:1651
990
  #: bbp-includes/bbp-topic-template.php:2559
991
  msgid "Spam"
992
  msgstr ""
993
 
994
  #: bbp-admin/bbp-replies.php:789 bbp-admin/bbp-topics.php:860
995
+ #: bbp-includes/bbp-reply-template.php:1595
996
  #: bbp-includes/bbp-topic-template.php:2317
997
  msgid "Restore this item from the Trash"
998
  msgstr ""
999
 
1000
  #: bbp-admin/bbp-replies.php:789 bbp-admin/bbp-topics.php:860
1001
+ #: bbp-includes/bbp-reply-template.php:1581
1002
  #: bbp-includes/bbp-topic-template.php:2303
1003
  msgid "Restore"
1004
  msgstr ""
1005
 
1006
  #: bbp-admin/bbp-replies.php:791 bbp-admin/bbp-topics.php:862
1007
+ #: bbp-includes/bbp-reply-template.php:1597
1008
  #: bbp-includes/bbp-topic-template.php:2319
1009
  msgid "Move this item to the Trash"
1010
  msgstr ""
1011
 
1012
  #: bbp-admin/bbp-replies.php:791 bbp-admin/bbp-topics.php:862
1013
+ #: bbp-includes/bbp-reply-template.php:1580
1014
  #: bbp-includes/bbp-topic-template.php:2302
1015
  msgid "Trash"
1016
  msgstr ""
1017
 
1018
  #: bbp-admin/bbp-replies.php:795 bbp-admin/bbp-topics.php:866
1019
+ #: bbp-includes/bbp-reply-template.php:1601
1020
  #: bbp-includes/bbp-topic-template.php:2323
1021
  msgid "Delete this item permanently"
1022
  msgstr ""
1718
  msgid "All Forums"
1719
  msgstr ""
1720
 
1721
+ #: bbp-admin/bbp-tools.php:816 bbp-includes/bbp-topic-functions.php:3111
1722
  #: bbpress.php:535
1723
  msgid "All Topics"
1724
  msgstr ""
1725
 
1726
+ #: bbp-admin/bbp-tools.php:817 bbp-includes/bbp-reply-functions.php:1414
1727
  #: bbpress.php:592
1728
  msgid "All Replies"
1729
  msgstr ""
2169
  msgid ","
2170
  msgstr ""
2171
 
2172
+ #: bbp-includes/bbp-common-functions.php:488
2173
+ #: bbp-includes/bbp-common-functions.php:520
2174
  msgid "Private: %s"
2175
  msgstr ""
2176
 
2177
+ #: bbp-includes/bbp-common-functions.php:489
2178
+ #: bbp-includes/bbp-common-functions.php:521
2179
  msgid "Spammed: %s"
2180
  msgstr ""
2181
 
2182
+ #: bbp-includes/bbp-common-functions.php:490
2183
+ #: bbp-includes/bbp-common-functions.php:522
2184
  msgid "Trashed: %s"
2185
  msgstr ""
2186
 
2187
+ #: bbp-includes/bbp-common-functions.php:597
2188
  msgid "<strong>ERROR</strong>: Invalid author name submitted!"
2189
  msgstr ""
2190
 
2191
+ #: bbp-includes/bbp-common-functions.php:601
2192
  msgid "<strong>ERROR</strong>: Invalid email address submitted!"
2193
  msgstr ""
2194
 
2195
+ #: bbp-includes/bbp-common-functions.php:1024
2196
  msgid ""
2197
  "%1$s wrote:\n"
2198
  "\n"
2207
  "Login and visit the topic to unsubscribe from these emails."
2208
  msgstr ""
2209
 
2210
+ #: bbp-includes/bbp-common-functions.php:1658
2211
  msgid ""
2212
  "Conditional query tags do not work before the query is run. Before then, "
2213
  "they always return false."
2227
 
2228
  #: bbp-includes/bbp-common-template.php:1344
2229
  #: bbp-includes/bbp-common-template.php:1355
2230
+ #: bbp-includes/bbp-topic-functions.php:1192
2231
+ #: bbp-includes/bbp-topic-functions.php:1515
2232
  #: bbp-theme-compat/bbpress/form-reply.php:29
2233
  #: bbp-themes/bbp-twentyten/bbpress/form-reply.php:29
2234
  msgid "Reply To: %s"
2235
  msgstr ""
2236
 
2237
+ #: bbp-includes/bbp-common-template.php:1761
2238
  msgid "Home"
2239
  msgstr ""
2240
 
2241
+ #: bbp-includes/bbp-common-template.php:1824
2242
  #: bbp-theme-compat/bbpress/user-details.php:20
2243
  #: bbp-themes/bbp-twentyten/bbpress/user-details.php:20
2244
  msgid "(Edit)"
2245
  msgstr ""
2246
 
2247
+ #: bbp-includes/bbp-common-template.php:1828
2248
+ #: bbp-includes/bbp-common-template.php:1928
2249
+ #: bbp-includes/bbp-common-template.php:2145
2250
  #: bbp-includes/bbp-theme-compatibility.php:543
2251
  #: bbp-includes/bbp-theme-compatibility.php:553
2252
  #: bbp-theme-compat/extras/taxonomy-topic-tag-edit.php:17
2256
  msgid "Topic Tag: %s"
2257
  msgstr ""
2258
 
2259
+ #: bbp-includes/bbp-common-template.php:1832
2260
+ #: bbp-includes/bbp-reply-template.php:1460
2261
  #: bbp-includes/bbp-topic-template.php:2181 bbpress.php:481 bbpress.php:538
2262
  #: bbpress.php:595
2263
  msgid "Edit"
2264
  msgstr ""
2265
 
2266
+ #: bbp-includes/bbp-common-template.php:1847
2267
  msgid "&rsaquo;"
2268
  msgstr ""
2269
 
2270
+ #: bbp-includes/bbp-common-template.php:2079
2271
  msgid "Log Out"
2272
  msgstr ""
2273
 
2274
+ #: bbp-includes/bbp-common-template.php:2132
2275
  msgid "Forum: %s"
2276
  msgstr ""
2277
 
2278
+ #: bbp-includes/bbp-common-template.php:2136
2279
  msgid "Topic: %s"
2280
  msgstr ""
2281
 
2282
+ #: bbp-includes/bbp-common-template.php:2154
2283
  msgid "Your Profile"
2284
  msgstr ""
2285
 
2286
+ #: bbp-includes/bbp-common-template.php:2159
2287
  msgid "%s's Profile"
2288
  msgstr ""
2289
 
2290
+ #: bbp-includes/bbp-common-template.php:2167
2291
  msgid "Edit Your Profile"
2292
  msgstr ""
2293
 
2294
+ #: bbp-includes/bbp-common-template.php:2172
2295
  msgid "Edit %s's Profile"
2296
  msgstr ""
2297
 
2298
+ #: bbp-includes/bbp-common-template.php:2179
2299
  msgid "View: %s"
2300
  msgstr ""
2301
 
2373
  msgstr ""
2374
 
2375
  #: bbp-includes/bbp-core-widgets.php:182 bbp-includes/bbp-core-widgets.php:308
2376
+ #: bbp-includes/bbp-core-widgets.php:445 bbp-includes/bbp-core-widgets.php:650
2377
+ #: bbp-includes/bbp-core-widgets.php:807
2378
  msgid "Title:"
2379
  msgstr ""
2380
 
2402
  msgid "(bbPress) Forums List"
2403
  msgstr ""
2404
 
2405
+ #: bbp-includes/bbp-core-widgets.php:451
2406
  msgid "Parent Forum ID:"
2407
  msgstr ""
2408
 
2409
+ #: bbp-includes/bbp-core-widgets.php:457
2410
  msgid "\"0\" to show only root - \"any\" to show all"
2411
  msgstr ""
2412
 
2413
+ #: bbp-includes/bbp-core-widgets.php:488
2414
  msgid "A list of recent topics, sorted by popularity or freshness."
2415
  msgstr ""
2416
 
2417
+ #: bbp-includes/bbp-core-widgets.php:491
2418
  msgid "(bbPress) Recent Topics"
2419
  msgstr ""
2420
 
2421
+ #: bbp-includes/bbp-core-widgets.php:651
2422
  msgid "Maximum topics to show:"
2423
  msgstr ""
2424
 
2425
+ #: bbp-includes/bbp-core-widgets.php:652 bbp-includes/bbp-core-widgets.php:809
2426
  msgid "Show post date:"
2427
  msgstr ""
2428
 
2429
+ #: bbp-includes/bbp-core-widgets.php:654
2430
+ msgid "Order By:"
2431
  msgstr ""
2432
 
2433
  #: bbp-includes/bbp-core-widgets.php:656
2434
+ msgid "Newest Topics"
 
 
2435
  msgstr ""
2436
 
2437
+ #: bbp-includes/bbp-core-widgets.php:657
2438
+ #: bbp-theme-compat/extras/page-forum-statistics.php:100
2439
+ #: bbp-themes/bbp-twentyten/page-forum-statistics.php:99
2440
+ msgid "Popular Topics"
2441
+ msgstr ""
2442
+
2443
+ #: bbp-includes/bbp-core-widgets.php:658
2444
+ msgid "Topics With Recent Replies"
2445
  msgstr ""
2446
 
2447
  #: bbp-includes/bbp-core-widgets.php:690
2448
+ msgid "A list of the most recent replies."
2449
+ msgstr ""
2450
+
2451
+ #: bbp-includes/bbp-core-widgets.php:693
2452
  msgid "(bbPress) Recent Replies"
2453
  msgstr ""
2454
 
2455
  #. translators: bbpress replies widget: 1: reply author, 2: reply link, 3:
2456
  #. reply date, 4: reply time
2457
+ #: bbp-includes/bbp-core-widgets.php:758
2458
  msgctxt "widgets"
2459
+ msgid "%1$s on %2$s %3$s, %4$s"
2460
  msgstr ""
2461
 
2462
+ #: bbp-includes/bbp-core-widgets.php:760
2463
  msgctxt "widgets"
2464
  msgid "%1$s on %2$s"
2465
  msgstr ""
2466
 
2467
+ #: bbp-includes/bbp-core-widgets.php:808
2468
  msgid "Maximum replies to show:"
2469
  msgstr ""
2470
 
2571
  #: bbp-includes/bbp-reply-functions.php:117
2572
  #: bbp-includes/bbp-reply-functions.php:392
2573
  #: bbp-includes/bbp-topic-functions.php:129
2574
+ #: bbp-includes/bbp-topic-functions.php:473
2575
+ #: bbp-includes/bbp-topic-functions.php:1051
2576
+ #: bbp-includes/bbp-topic-functions.php:1353
2577
+ #: bbp-includes/bbp-topic-functions.php:1656
2578
+ #: bbp-includes/bbp-topic-functions.php:1695
2579
+ #: bbp-includes/bbp-topic-functions.php:1752
2580
  #: bbp-includes/bbp-user-functions.php:472
2581
  #: bbp-includes/bbp-user-functions.php:792
2582
  #: bbp-includes/bbp-user-functions.php:919
2752
 
2753
  #: bbp-includes/bbp-reply-functions.php:168
2754
  #: bbp-includes/bbp-topic-functions.php:199
2755
+ #: bbp-includes/bbp-topic-functions.php:487
2756
  msgid "<strong>ERROR</strong>: Forum ID is missing."
2757
  msgstr ""
2758
 
2776
  msgstr ""
2777
 
2778
  #: bbp-includes/bbp-reply-functions.php:270
2779
+ #: bbp-includes/bbp-reply-functions.php:526
2780
  msgid ""
2781
  "<strong>ERROR</strong>: There was a problem adding the tags to the topic."
2782
  msgstr ""
2820
  msgid "<strong>ERROR</strong>: Your reply cannot be edited at this time."
2821
  msgstr ""
2822
 
2823
+ #: bbp-includes/bbp-reply-functions.php:1019
2824
  msgid "<strong>ERROR:</strong> You do not have the permission to do that!"
2825
  msgstr ""
2826
 
2827
+ #: bbp-includes/bbp-reply-functions.php:1032
2828
  msgid ""
2829
  "<strong>ERROR</strong>: There was a problem unmarking the reply as spam!"
2830
  msgstr ""
2831
 
2832
+ #: bbp-includes/bbp-reply-functions.php:1032
2833
  msgid "<strong>ERROR</strong>: There was a problem marking the reply as spam!"
2834
  msgstr ""
2835
 
2836
+ #: bbp-includes/bbp-reply-functions.php:1051
2837
  msgid "<strong>ERROR</strong>: There was a problem trashing the reply!"
2838
  msgstr ""
2839
 
2840
+ #: bbp-includes/bbp-reply-functions.php:1059
2841
  msgid "<strong>ERROR</strong>: There was a problem untrashing the reply!"
2842
  msgstr ""
2843
 
2844
+ #: bbp-includes/bbp-reply-functions.php:1067
2845
  msgid "<strong>ERROR</strong>: There was a problem deleting the reply!"
2846
  msgstr ""
2847
 
2848
+ #: bbp-includes/bbp-reply-functions.php:1412
2849
  msgid "All Posts"
2850
  msgstr ""
2851
 
2852
+ #: bbp-includes/bbp-reply-functions.php:1454
2853
+ #: bbp-includes/bbp-topic-functions.php:3136
2854
  msgid "Replies: %s"
2855
  msgstr ""
2856
 
2857
+ #: bbp-includes/bbp-reply-template.php:582
2858
  msgid "This reply was modified %1$s by %2$s. Reason: %3$s"
2859
  msgstr ""
2860
 
2861
+ #: bbp-includes/bbp-reply-template.php:584
2862
  msgid "This reply was modified %1$s by %2$s."
2863
  msgstr ""
2864
 
2865
+ #: bbp-includes/bbp-reply-template.php:865
2866
  #: bbp-includes/bbp-topic-template.php:1168
2867
  #: bbp-includes/bbp-user-template.php:162
2868
  msgid "Anonymous"
2869
  msgstr ""
2870
 
2871
+ #: bbp-includes/bbp-reply-template.php:966
2872
  #: bbp-includes/bbp-topic-template.php:1273
2873
  #: bbp-includes/bbp-user-template.php:1194
2874
  msgid "View %s's profile"
2875
  msgstr ""
2876
 
2877
+ #: bbp-includes/bbp-reply-template.php:966
2878
  #: bbp-includes/bbp-topic-template.php:1273
2879
  #: bbp-includes/bbp-user-template.php:1194
2880
  msgid "Visit %s's website"
2881
  msgstr ""
2882
 
2883
+ #: bbp-includes/bbp-reply-template.php:1582
2884
  #: bbp-includes/bbp-topic-template.php:2304
2885
  #: bbp-theme-compat/bbpress/form-topic-tag.php:88
2886
  #: bbp-theme-compat/bbpress/form-topic-tag.php:101
2889
  msgid "Delete"
2890
  msgstr ""
2891
 
2892
+ #: bbp-includes/bbp-reply-template.php:1601
2893
  #: bbp-includes/bbp-topic-template.php:2323
2894
  msgid "Are you sure you want to delete that permanently?"
2895
  msgstr ""
2896
 
2897
+ #: bbp-includes/bbp-reply-template.php:1652
2898
  #: bbp-includes/bbp-topic-template.php:2560
2899
  msgid "Unspam"
2900
  msgstr ""
2901
 
2902
+ #: bbp-includes/bbp-reply-template.php:1715
2903
  msgid "Split"
2904
  msgstr ""
2905
 
2906
+ #: bbp-includes/bbp-reply-template.php:1716
2907
  msgid "Split the topic from this reply"
2908
  msgstr ""
2909
 
2910
+ #: bbp-includes/bbp-reply-template.php:1823
2911
  msgid "Viewing %1$s reply"
2912
  msgid_plural "Viewing %1$s replies"
2913
  msgstr[0] ""
2914
  msgstr[1] ""
2915
 
2916
+ #: bbp-includes/bbp-reply-template.php:1827
2917
  msgid "Viewing %2$s replies (of %4$s total)"
2918
  msgid_plural "Viewing %1$s replies - %2$s through %3$s (of %4$s total)"
2919
  msgstr[0] ""
2920
  msgstr[1] ""
2921
 
2922
+ #: bbp-includes/bbp-reply-template.php:1835
2923
  msgid "Viewing %1$s post"
2924
  msgid_plural "Viewing %1$s posts"
2925
  msgstr[0] ""
2926
  msgstr[1] ""
2927
 
2928
+ #: bbp-includes/bbp-reply-template.php:1839
2929
  msgid "Viewing %2$s post (of %4$s total)"
2930
  msgid_plural "Viewing %1$s posts - %2$s through %3$s (of %4$s total)"
2931
  msgstr[0] ""
2937
  msgstr ""
2938
 
2939
  #: bbp-includes/bbp-topic-functions.php:181
2940
+ #: bbp-includes/bbp-topic-functions.php:527
2941
  msgid "<strong>ERROR</strong>: Your topic needs a title."
2942
  msgstr ""
2943
 
2944
  #: bbp-includes/bbp-topic-functions.php:193
2945
+ #: bbp-includes/bbp-topic-functions.php:539
2946
  msgid "<strong>ERROR</strong>: Your topic cannot be empty."
2947
  msgstr ""
2948
 
2953
  msgstr ""
2954
 
2955
  #: bbp-includes/bbp-topic-functions.php:214
2956
+ #: bbp-includes/bbp-topic-functions.php:506
2957
  msgid "<strong>ERROR</strong>: This forum has been closed to new topics."
2958
  msgstr ""
2959
 
2960
  #: bbp-includes/bbp-topic-functions.php:218
2961
+ #: bbp-includes/bbp-topic-functions.php:510
2962
  msgid ""
2963
  "<strong>ERROR</strong>: This forum is private and you do not have the "
2964
  "capability to read or create new topics in it."
2965
  msgstr ""
2966
 
2967
  #: bbp-includes/bbp-topic-functions.php:222
2968
+ #: bbp-includes/bbp-topic-functions.php:514
2969
  msgid ""
2970
  "<strong>ERROR</strong>: This forum is hidden and you do not have the "
2971
  "capability to read or create new topics in it."
2981
  msgid "<strong>ERROR</strong>: Your topic cannot be created at this time."
2982
  msgstr ""
2983
 
2984
+ #: bbp-includes/bbp-topic-functions.php:438
2985
+ #: bbp-includes/bbp-topic-functions.php:1045
2986
  msgid "<strong>ERROR</strong>: Topic ID not found."
2987
  msgstr ""
2988
 
2989
+ #: bbp-includes/bbp-topic-functions.php:449
2990
  msgid "<strong>ERROR</strong>: The topic you want to edit was not found."
2991
  msgstr ""
2992
 
2993
+ #: bbp-includes/bbp-topic-functions.php:460
2994
  msgid "<strong>ERROR</strong>: You do not have permission to edit that topic."
2995
  msgstr ""
2996
 
2997
+ #: bbp-includes/bbp-topic-functions.php:502
2998
  msgid ""
2999
  "<strong>ERROR</strong>: This forum is a category. No topics can be created "
3000
  "in it."
3001
  msgstr ""
3002
 
3003
+ #: bbp-includes/bbp-topic-functions.php:544
3004
  msgid "<strong>ERROR</strong>: Your topic cannot be edited at this time."
3005
  msgstr ""
3006
 
3007
+ #: bbp-includes/bbp-topic-functions.php:1056
3008
  msgid "<strong>ERROR</strong>: The topic you want to merge was not found."
3009
  msgstr ""
3010
 
3011
+ #: bbp-includes/bbp-topic-functions.php:1062
3012
+ #: bbp-includes/bbp-topic-functions.php:1359
3013
  msgid ""
3014
  "<strong>ERROR</strong>: You do not have the permissions to edit the source "
3015
  "topic."
3016
  msgstr ""
3017
 
3018
+ #: bbp-includes/bbp-topic-functions.php:1070
3019
  msgid "<strong>ERROR</strong>: Destination topic ID not found."
3020
  msgstr ""
3021
 
3022
+ #: bbp-includes/bbp-topic-functions.php:1076
3023
  msgid "<strong>ERROR</strong>: The topic you want to merge to was not found."
3024
  msgstr ""
3025
 
3026
+ #: bbp-includes/bbp-topic-functions.php:1080
3027
  msgid ""
3028
  "<strong>ERROR</strong>: You do not have the permissions to edit the "
3029
  "destination topic."
3030
  msgstr ""
3031
 
3032
+ #: bbp-includes/bbp-topic-functions.php:1332
3033
  msgid "<strong>ERROR</strong>: Reply ID to split the topic from not found!"
3034
  msgstr ""
3035
 
3036
+ #: bbp-includes/bbp-topic-functions.php:1340
3037
  msgid "<strong>ERROR</strong>: The reply you want to split from was not found."
3038
  msgstr ""
3039
 
3040
+ #: bbp-includes/bbp-topic-functions.php:1349
3041
  msgid "<strong>ERROR</strong>: The topic you want to split was not found."
3042
  msgstr ""
3043
 
3044
+ #: bbp-includes/bbp-topic-functions.php:1367
3045
  msgid "<strong>ERROR</strong>: You need to choose a valid split option."
3046
  msgstr ""
3047
 
3048
+ #: bbp-includes/bbp-topic-functions.php:1380
3049
  msgid "<strong>ERROR</strong>: Destination topic ID not found!"
3050
  msgstr ""
3051
 
3052
+ #: bbp-includes/bbp-topic-functions.php:1389
3053
  msgid "<strong>ERROR</strong>: The topic you want to split to was not found!"
3054
  msgstr ""
3055
 
3056
+ #: bbp-includes/bbp-topic-functions.php:1393
3057
  msgid ""
3058
  "<strong>ERROR</strong>: You do not have the permissions to edit the "
3059
  "destination topic!"
3060
  msgstr ""
3061
 
3062
+ #: bbp-includes/bbp-topic-functions.php:1432
3063
  msgid ""
3064
  "<strong>ERROR</strong>: There was a problem converting the reply into the "
3065
  "topic. Please try again."
3066
  msgstr ""
3067
 
3068
+ #: bbp-includes/bbp-topic-functions.php:1437
3069
  msgid ""
3070
  "<strong>ERROR</strong>: You do not have the permissions to create new "
3071
  "topics. The reply could not be converted into a topic."
3072
  msgstr ""
3073
 
3074
+ #: bbp-includes/bbp-topic-functions.php:1644
3075
  msgid ""
3076
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3077
  "getting the tag: %s"
3078
  msgstr ""
3079
 
3080
+ #: bbp-includes/bbp-topic-functions.php:1662
3081
+ #: bbp-includes/bbp-topic-functions.php:1701
3082
  msgid ""
3083
  "<strong>ERROR</strong>: You do not have the permissions to edit the topic "
3084
  "tags."
3085
  msgstr ""
3086
 
3087
+ #: bbp-includes/bbp-topic-functions.php:1668
3088
+ #: bbp-includes/bbp-topic-functions.php:1707
3089
  msgid "<strong>ERROR</strong>: You need to enter a tag name."
3090
  msgstr ""
3091
 
3092
+ #: bbp-includes/bbp-topic-functions.php:1678
3093
  msgid ""
3094
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3095
  "updating the tag: %s"
3096
  msgstr ""
3097
 
3098
+ #: bbp-includes/bbp-topic-functions.php:1717
3099
+ #: bbp-includes/bbp-topic-functions.php:1735
3100
  msgid ""
3101
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3102
  "merging the tags: %s"
3103
  msgstr ""
3104
 
3105
+ #: bbp-includes/bbp-topic-functions.php:1726
3106
  msgid ""
3107
  "<strong>ERROR</strong>: The tags which are being merged can not be the same."
3108
  msgstr ""
3109
 
3110
+ #: bbp-includes/bbp-topic-functions.php:1758
3111
  msgid ""
3112
  "<strong>ERROR</strong>: You do not have the permissions to delete the topic "
3113
  "tags."
3114
  msgstr ""
3115
 
3116
+ #: bbp-includes/bbp-topic-functions.php:1767
3117
  msgid ""
3118
  "<strong>ERROR</strong>: The following problem(s) have been found while "
3119
  "deleting the tag: %s"
3120
  msgstr ""
3121
 
3122
+ #: bbp-includes/bbp-topic-functions.php:1896
3123
  msgid "<strong>ERROR:</strong> You do not have the permission to do that."
3124
  msgstr ""
3125
 
3126
+ #: bbp-includes/bbp-topic-functions.php:1909
3127
  msgid "<strong>ERROR</strong>: There was a problem closing the topic."
3128
  msgstr ""
3129
 
3130
+ #: bbp-includes/bbp-topic-functions.php:1909
3131
  msgid "<strong>ERROR</strong>: There was a problem opening the topic."
3132
  msgstr ""
3133
 
3134
+ #: bbp-includes/bbp-topic-functions.php:1920
3135
  msgid "<strong>ERROR</strong>: There was a problem unsticking the topic."
3136
  msgstr ""
3137
 
3138
+ #: bbp-includes/bbp-topic-functions.php:1920
3139
  msgid "<strong>ERROR</strong>: There was a problem sticking the topic."
3140
  msgstr ""
3141
 
3142
+ #: bbp-includes/bbp-topic-functions.php:1930
3143
  msgid ""
3144
  "<strong>ERROR</strong>: There was a problem unmarking the topic as spam."
3145
  msgstr ""
3146
 
3147
+ #: bbp-includes/bbp-topic-functions.php:1930
3148
  msgid "<strong>ERROR</strong>: There was a problem marking the topic as spam."
3149
  msgstr ""
3150
 
3151
+ #: bbp-includes/bbp-topic-functions.php:1949
3152
  msgid "<strong>ERROR</strong>: There was a problem trashing the topic."
3153
  msgstr ""
3154
 
3155
+ #: bbp-includes/bbp-topic-functions.php:1957
3156
  msgid "<strong>ERROR</strong>: There was a problem untrashing the topic."
3157
  msgstr ""
3158
 
3159
+ #: bbp-includes/bbp-topic-functions.php:1965
3160
  msgid "<strong>ERROR</strong>: There was a problem deleting the topic."
3161
  msgstr ""
3162
 
4142
  msgid "Hidden Replies"
4143
  msgstr ""
4144
 
 
 
 
 
 
4145
  #: bbp-theme-compat/extras/page-topic-tags.php:22
4146
  #: bbp-themes/bbp-twentyten/page-topic-tags.php:23
4147
  msgid ""
4348
  msgid "bbPress"
4349
  msgstr ""
4350
 
4351
+ #. #-#-#-#-# plugin.pot (bbPress 2.1-rc4) #-#-#-#-#
4352
  #. Plugin URI of the plugin/theme
4353
+ #. #-#-#-#-# plugin.pot (bbPress 2.1-rc4) #-#-#-#-#
4354
  #. Author URI of the plugin/theme
4355
  msgid "http://bbpress.org"
4356
  msgstr ""
bbp-theme-compat/bbpress/form-user-edit.php CHANGED
@@ -88,10 +88,10 @@
88
 
89
  </fieldset>
90
 
91
- <h2 class="entry-title"><?php _e( 'Account' ) ?></h2>
92
 
93
  <fieldset class="bbp-form">
94
- <legend><?php _e( 'Account' ) ?></legend>
95
 
96
  <?php do_action( 'bbp_user_edit_before_account' ); ?>
97
 
88
 
89
  </fieldset>
90
 
91
+ <h2 class="entry-title"><?php _e( 'Account', 'bbpress' ) ?></h2>
92
 
93
  <fieldset class="bbp-form">
94
+ <legend><?php _e( 'Account', 'bbpress' ) ?></legend>
95
 
96
  <?php do_action( 'bbp_user_edit_before_account' ); ?>
97
 
bbp-themes/bbp-twentyten/bbpress/form-user-edit.php CHANGED
@@ -88,10 +88,10 @@
88
 
89
  </fieldset>
90
 
91
- <h2 class="entry-title"><?php _e( 'Account' ) ?></h2>
92
 
93
  <fieldset class="bbp-form">
94
- <legend><?php _e( 'Account' ) ?></legend>
95
 
96
  <?php do_action( 'bbp_user_edit_before_account' ); ?>
97
 
88
 
89
  </fieldset>
90
 
91
+ <h2 class="entry-title"><?php _e( 'Account', 'bbpress' ) ?></h2>
92
 
93
  <fieldset class="bbp-form">
94
+ <legend><?php _e( 'Account', 'bbpress' ) ?></legend>
95
 
96
  <?php do_action( 'bbp_user_edit_before_account' ); ?>
97
 
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 4027 2012-06-28 20:07:18Z 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-rc3
21
  * Text Domain: bbpress
22
  * Domain Path: /bbp-languages/
23
  */
@@ -173,7 +173,7 @@ final class bbPress {
173
 
174
  /** Versions **********************************************************/
175
 
176
- $this->version = '2.1-rc3'; // bbPress version
177
  $this->db_version = '203'; // bbPress DB version
178
 
179
  /** Paths *************************************************************/
5
  *
6
  * bbPress is forum software with a twist from the creators of WordPress.
7
  *
8
+ * $Id: bbpress.php 4043 2012-07-02 01:01:29Z 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-rc4
21
  * Text Domain: bbpress
22
  * Domain Path: /bbp-languages/
23
  */
173
 
174
  /** Versions **********************************************************/
175
 
176
+ $this->version = '2.1-rc4'; // bbPress version
177
  $this->db_version = '203'; // bbPress DB version
178
 
179
  /** Paths *************************************************************/
readme.txt CHANGED
@@ -26,6 +26,12 @@ We're keeping things as small and light as possible while still allowing for gre
26
 
27
  == Changelog ==
28
 
 
 
 
 
 
 
29
  = 2.1-rc-3 =
30
  * Improve nonce checks
31
  * Fixed user-edit bug
26
 
27
  == Changelog ==
28
 
29
+ = 2.1-rc-4 =
30
+ * Improved cache busting on creation
31
+ * Fixed Akismet edit bug
32
+ * Fixed Widgets nooping globals
33
+ * Fixed translation load order
34
+
35
  = 2.1-rc-3 =
36
  * Improve nonce checks
37
  * Fixed user-edit bug