Skip to:
Content

bbPress.org

Changeset 7275

Timestamp:
06/29/2024 05:15:20 PM (6 weeks ago)
Author:
johnjamesjacoby
Message:

Merge 2.6 improvements into trunk.

From 2.6.11.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/package.json

    r7269 r7275  
    11{
    22    "name": "bbpress",
     3
    34    "author": "The bbPress Contributors",
    45    "description": "Forum software with a twist from the creators of WordPress.",

  • trunk/src/includes/common/functions.php

    r7268 r7275  
    843843 * @param string $title The title of the content
    844844 * @param string $content The content being posted
    845  * @param mixed  $strict  False for moderation_keys. True for blacklist_keys.
     845 * @param mixed  $strict  False for moderation_keys. True for _keys.
    846846 *                        String for custom keys.
    847847 * @return bool True if test is passed, false if fail
    … …  
    864864    }
    865865
    866     // Strict mode uses WordPress "blacklist" settings
     866    // Strict mode uses WordPress "" settings
    867867    if ( true === $strict ) {
    868868        $hook_name   = 'blacklist';
    869         $option_name = 'blacklist_keys';
     869        $option_name = '_keys';
    870870
    871871    // Non-strict uses WordPress "moderation" settings

  • trunk/src/includes/forums/functions.php

    r7268 r7275  
    23102310    $post_types = array_filter( (array) $posts_query->get( 'post_type' ) );
    23112311
     2312
     2313
     2314
     2315
     2316
    23122317    // Forums
    23132318    if ( in_array( bbp_get_forum_post_type(), $post_types, true ) ) {
    … …  
    23352340    }
    23362341
    2337     // Some other post type besides Forums, Topics, or Replies
     2342    //
    23382343    if ( ! array_diff( $post_types, bbp_get_post_types() ) ) {
    23392344

  • trunk/src/readme.txt

    r7268 r7275  
    77Requires at least: 6.0
    88Tested up to:      6.5
    9 Stable tag:        2.7.0-alpha-2
     9Stable tag:        2.
    1010
    1111bbPress is forum software for WordPress.

  • trunk/tests/phpunit/testcases/common/functions.php

    r6869 r7275  
    961961        $content        = 'Beware, they maybe bees hibernating.';
    962962
    963         update_option( 'blacklist_keys',"hibernating\nfoo" );
     963        update_option( '_keys',"hibernating\nfoo" );
    964964
    965965        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    967967        $this->assertFalse( $result );
    968968
    969         update_option( 'blacklist_keys',"foo\nbar" );
     969        update_option( '_keys',"foo\nbar" );
    970970
    971971        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    993993        $content        = bbp_get_topic_content( $t );
    994994
    995         update_option( 'blacklist_keys',"http://example.net/banned\nfoo" );
     995        update_option( '_keys',"http://example.net/banned\nfoo" );
    996996
    997997        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    10191019        $content        = bbp_get_topic_content( $t );
    10201020
    1021         update_option( 'blacklist_keys',"banned@example.net\nfoo" );
     1021        update_option( '_keys',"banned@example.net\nfoo" );
    10221022
    10231023        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    10431043        $content        = bbp_get_topic_content( $t );
    10441044
    1045         update_option( 'blacklist_keys',"127.0.0.1\nfoo" );
     1045        update_option( '_keys',"127.0.0.1\nfoo" );
    10461046
    10471047        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    10711071        $content        = bbp_get_topic_content( $t );
    10721072
    1073         update_option( 'blacklist_keys',"hibernating\nfoo" );
     1073        update_option( '_keys',"hibernating\nfoo" );
    10741074
    10751075        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    11021102        $content        = bbp_get_topic_content( $t );
    11031103
    1104         update_option( 'blacklist_keys',"hibernating\nfoo" );
     1104        update_option( '_keys',"hibernating\nfoo" );
    11051105
    11061106        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    11211121        $content        = 'Beware, there maybe bees <a href="http://example.com/hibernating/>buzzing</a>, buzzing.';
    11221122
    1123         update_option( 'blacklist_keys',"hibernating\nfoo" );
     1123        update_option( '_keys',"hibernating\nfoo" );
    11241124
    11251125        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
    … …  
    11451145        $content        = bbp_get_topic_content( $t );
    11461146
    1147         update_option( 'blacklist_keys',"hibernating\nfoo" );
     1147        update_option( '_keys',"hibernating\nfoo" );
    11481148
    11491149        $result = bbp_check_for_moderation( $anonymous_data, $author_id, $title, $content, true );
Note: See TracChangeset for help on using the changeset viewer.