Skip to:
Content

BuddyPress.org

Changeset 11764


Ignore:
Timestamp:
12/08/2017 03:52:14 PM (4 years ago)
Author:
djpaul
Message:

Update internal comments/strings with relation to recent Legacy Forums removal.

Location:
trunk/src
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/bp-activity/bp-activity-admin.php

    r11703 r11764  
    233233            'content' =>
    234234                '<p>' . __( '<strong>Primary Item/Secondary Item</strong> - These identify the object that created the activity. For example, the fields could reference a comment left on a specific site. Some types of activity may only use one, or none, of these fields.', 'buddypress' ) . '</p>' .
    235                 '<p>' . __( '<strong>Link</strong> - Used by some types of activity (e.g blog posts and comments, and forum topics and replies) to store a link back to the original content.', 'buddypress' ) . '</p>' .
     235                '<p>' . __( '<strong>Link</strong> - Used by some types of activity (blog posts and comments) to store a link back to the original content.', 'buddypress' ) . '</p>' .
    236236                '<p>' . __( '<strong>Type</strong> - Each distinct kind of activity has its own type. For example, <code>created_group</code> is used when a group is created and <code>joined_group</code> is used when a user joins a group.', 'buddypress' ) . '</p>' .
    237237                '<p>' . __( 'For information about when and how BuddyPress uses all of these settings, see the Managing Activity link in the panel to the side.', 'buddypress' ) . '</p>'
     
    801801    ?></label>
    802802    <input type="url" name="bp-activities-link" id="bp-activities-link" value="<?php echo esc_url( $item->primary_link ); ?>" aria-describedby="bp-activities-link-description" />
    803     <p id="bp-activities-link-description"><?php _e( 'Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
     803    <p id="bp-activities-link-description"><?php _e( 'Activity generated by posts and comments uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
    804804
    805805<?php
  • trunk/src/bp-activity/bp-activity-functions.php

    r11756 r11764  
    17041704         *     'object'       => false, // Object to filter on e.g. groups, profile, status, friends.
    17051705         *     'action'       => false, // Action to filter on e.g. activity_update, profile_updated.
    1706          *     'primary_id'   => false, // Object ID to filter on e.g. a group_id or forum_id or blog_id etc.
     1706         *     'primary_id'   => false, // Object ID to filter on e.g. a group_id or blog_id etc.
    17071707         *     'secondary_id' => false, // Secondary object ID to filter on e.g. a post_id.
    17081708         * );
  • trunk/src/bp-activity/bp-activity-notifications.php

    r11606 r11764  
    290290 * Add a notification for post comments to the post author or post commenter.
    291291 *
    292  * Requires "activity stream commenting on blog and forum posts" to be enabled.
     292 * Requires "activity stream commenting on posts and comments" to be enabled.
    293293 *
    294294 * @since 2.6.0
  • trunk/src/bp-activity/bp-activity-template.php

    r11598 r11764  
    267267        'user_id'           => $user_id,     // user_id to filter on.
    268268        'object'            => $object,      // Object to filter on e.g. groups, profile, status, friends.
    269         'action'            => false,        // Action to filter on e.g. activity_update, new_forum_post, profile_updated.
    270         'primary_id'        => $primary_id,  // Object ID to filter on e.g. a group_id or forum_id or blog_id etc.
     269        'action'            => false,        // Action to filter on e.g. activity_update, profile_updated.
     270        'primary_id'        => $primary_id,  // Object ID to filter on e.g. a group_id or blog_id etc.
    271271        'secondary_id'      => false,        // Secondary object ID to filter on e.g. a post_id.
    272272        'offset'            => false,        // Return only items >= this ID.
  • trunk/src/bp-activity/classes/class-bp-activity-list-table.php

    r11606 r11764  
    4848
    4949    /**
    50      * If users can comment on blog & forum activity items.
     50     * If users can comment on post and comment activity items.
    5151     *
    5252     * @link https://buddypress.trac.wordpress.org/ticket/6277
     
    6464    public function __construct() {
    6565
    66         // See if activity commenting is enabled for blog / forum activity items.
     66        // See if activity commenting is enabled for post/comment activity items.
    6767        $this->disable_blogforum_comments = bp_disable_blogforum_comments();
    6868
  • trunk/src/bp-activity/classes/class-bp-activity-template.php

    r11692 r11764  
    192192        $this->pag_num  = bp_sanitize_pagination_arg( 'num',          $r['per_page'] );
    193193
    194         // Check if blog/forum replies are disabled.
     194        // Check if post/comment replies are disabled.
    195195        $this->disable_blogforum_replies = (bool) bp_core_get_root_option( 'bp-disable-blogforum-comments' );
    196196
  • trunk/src/bp-core/admin/bp-core-admin-settings.php

    r11763 r11764  
    105105
    106106/**
    107  * Allow activity comments on blog posts and forum posts.
     107 * Allow activity comments on posts and comments.
    108108 *
    109109 * @since 1.6.0
     
    113113
    114114    <input id="bp-disable-blogforum-comments" name="bp-disable-blogforum-comments" type="checkbox" value="1" <?php checked( !bp_disable_blogforum_comments( false ) ); ?> />
    115     <label for="bp-disable-blogforum-comments"><?php _e( 'Allow activity stream commenting on blog and forum posts', 'buddypress' ); ?></label>
     115    <label for="bp-disable-blogforum-comments"><?php _e( 'Allow activity stream commenting on posts and comments', 'buddypress' ); ?></label>
    116116
    117117<?php
     
    135135 * Sanitization for bp-disable-blogforum-comments setting.
    136136 *
    137  * In the UI, a checkbox asks whether you'd like to *enable* blog/forum activity comments. For
     137 * In the UI, a checkbox asks whether you'd like to *enable* post/comment activity comments. For
    138138 * legacy reasons, the option that we store is 1 if these comments are *disabled*. So we use this
    139139 * function to flip the boolean before saving the intval.
  • trunk/src/bp-core/bp-core-options.php

    r11763 r11764  
    6666        'bp-disable-account-deletion'          => false,
    6767
    68         // Allow comments on blog and forum activity items.
     68        // Allow comments on post and comment activity items.
    6969        'bp-disable-blogforum-comments'        => true,
    7070
     
    622622
    623623/**
    624  * Are blog and forum activity stream comments disabled?
     624 * Are post/comment activity stream comments disabled?
    625625 *
    626626 * @since 1.6.0
  • trunk/src/bp-core/classes/class-bp-admin.php

    r11763 r11764  
    451451            add_settings_section( 'bp_activity', __( 'Activity Settings', 'buddypress' ), 'bp_admin_setting_callback_activity_section', 'buddypress' );
    452452
    453             // Activity commenting on blog and forum posts.
    454             add_settings_field( 'bp-disable-blogforum-comments', __( 'Blog &amp; Forum Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
     453            // Activity commenting on post and comments.
     454            add_settings_field( 'bp-disable-blogforum-comments', __( 'Post Comments', 'buddypress' ), 'bp_admin_setting_callback_blogforum_comments', 'buddypress', 'bp_activity' );
    455455            register_setting( 'buddypress', 'bp-disable-blogforum-comments', 'bp_admin_sanitize_callback_blogforum_comments' );
    456456
  • trunk/src/bp-groups/bp-groups-filters.php

    r11763 r11764  
    1111defined( 'ABSPATH' ) || exit;
    1212
    13 // Filter bbPress template locations.
     13// Filter BuddyPress template locations.
    1414add_filter( 'bp_groups_get_directory_template', 'bp_add_template_locations' );
    1515add_filter( 'bp_get_single_group_template',    'bp_add_template_locations' );
  • trunk/src/bp-groups/bp-groups-functions.php

    r11763 r11764  
    8989 *     @type int      $parent_id    The ID of the parent group. Default: 0.
    9090 *     @type int      $enable_forum Optional. Whether the group has a forum enabled.
    91  *                                  If the legacy forums are enabled for this group
    92  *                                  or if a bbPress forum is enabled for the group,
     91 *                                  If a bbPress forum is enabled for the group,
    9392 *                                  set this to 1. Default: 0.
    9493 *     @type string   $date_created The GMT time, in Y-m-d h:i:s format, when the group
     
    770769
    771770    $defaults = array(
    772         'type'               => false,          // Active, newest, alphabetical, random, popular, most-forum-topics or most-forum-posts.
     771        'type'               => false,          // Active, newest, alphabetical, random, popular.
    773772        'order'              => 'DESC',         // 'ASC' or 'DESC'
    774773        'orderby'            => 'date_created', // date_created, last_activity, total_member_count, name, random, meta_id.
Note: See TracChangeset for help on using the changeset viewer.