Changeset 3109759

Timestamp:

06/29/2024 05:24:39 PM (4 weeks ago)

Author:

johnjamesjacoby

Message:

bbPress: merge dev trunk with deploy trunk.

Includes fixes from 2.6.11.

Location:

bbpress/trunk

Files:

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

bbpress/trunk/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
@@ -864 +864 @@
     }
 
-    // Strict mode uses WordPress "blacklist" settings
+    // Strict mode uses WordPress "" settings
     if ( true === $strict ) {
         $hook_name   = 'blacklist';
-        $option_name = 'blacklist_keys';
+        $option_name = '_keys';
 
     // Non-strict uses WordPress "moderation" settings

bbpress/trunk/includes/forums/functions.php

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

bbpress/trunk/readme.txt

@@ -3 +3 @@
 Author:            The bbPress Contributors
 Author URI:        https://bbpress.org
-Plugin URI:        https://bbpress.org
 License URI:       https://www.gnu.org/licenses/gpl-2.0.html
 License:           GNU General Public License v2 or later