Changeset 3109751

Timestamp:

06/29/2024 05:00:48 PM (6 weeks ago)

Author:

johnjamesjacoby

Message:

bbPress: merge 2.6 dev branch into 2.6 deploy branch.

Location:

bbpress/branches/2.6

Files:

• bbpress.php (modified) (3 diffs)
• includes/common/functions.php (modified) (2 diffs)
• includes/forums/functions.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

bbpress/branches/2.6/bbpress.php

@@ -6 +6 @@
  * bbPress is forum software with a twist from the creators of WordPress.
  *
- * $Id: bbpress.php 7265 2024-06-28 19:19:30Z johnjamesjacoby $
+ * $Id: bbpress.php 720Z johnjamesjacoby $
  *
  * @package bbPress
@@ -23 +23 @@
  * Domain Path:       /languages/
  * Requires PHP:      5.6.20
- * Requires at least: 5.0
+ * Requires at least: .0
  * Tested up to:      6.5
- * Version:           2.6.10
+ * Version:           2.6.1
  */
 
@@ -208 +208 @@
         /** Versions **********************************************************/
 
-        $this->version    = '2.6.10';
+        $this->version    = '2.6.1';
         $this->db_version = '263';
 

bbpress/branches/2.6/includes/common/functions.php

@@ -843 +843 @@
  * @param string $title The title of the content
  * @param string $content The content being posted
- * @param mixed  $strict  False for moderation_keys. True for blacklist_keys.
+ * @param mixed  $strict  False for moderation_keys. True for _keys.
  *                        String for custom keys.
  * @return bool True if test is passed, false if fail
@@ -867 +867 @@
     if ( true === $strict ) {
         $hook_name   = 'blacklist';
-        $option_name = 'blacklist_keys';
+        $option_name = '_keys';
 
     // Non-strict uses WordPress "moderation" settings

bbpress/branches/2.6/includes/forums/functions.php

@@ -2317 +2317 @@
     $post_types = array_filter( (array) $posts_query->get( 'post_type' ) );
 
+
+
+
+
+
     // Forums
     if ( in_array( bbp_get_forum_post_type(), $post_types, true ) ) {
@@ -2342 +2347 @@
     }
 
-    // Some other post type besides Forums, Topics, or Replies
+    // 
     if ( ! array_diff( $post_types, bbp_get_post_types() ) ) {
 

bbpress/branches/2.6/readme.txt

@@ -5 +5 @@
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 Requires PHP:      5.6.20
-Requires at least: 5.0
+Requires at least: .0
 Tested up to:      6.5
-Stable tag:        2.6.10
+Stable tag:        2.6.1
 
 bbPress is forum software for WordPress.