Skip to:
Content

BuddyPress.org


Ignore:
Timestamp:
12/20/2014 07:58:37 PM (12 years ago)
Author:
djpaul
Message:

Suggestions: move the blog checks in bp_activity_maybe_load_mentions_scripts to a filter in the core component.

This reorganisation keeps the component-specific mentions checks in those specific components, rather than bundling everything into the Activity component as it had been.

See #5934

File:
1 edited

Legend:

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

    r9194 r9243  
    6565 */
    6666function bp_activity_maybe_load_mentions_scripts() {
    67         $retval =
    68                 bp_activity_do_mentions() &&
    69                 bp_is_user_active() &&
    70                 ( bp_is_activity_component() || bp_is_blog_page() && is_singular() && comments_open() || is_admin() );
     67        $mentions_enabled = bp_activity_do_mentions() && bp_is_user_active();
     68        $load_mentions    = $mentions_enabled && ( bp_is_activity_component() || is_admin() );
    7169
    7270        /**
    … …  
    7573         * @since BuddyPress (2.1.0)
    7674         *
    77          * @param bool $retval True to load mentions assets, false otherwise.
    78          */
    79         return (bool) apply_filters( 'bp_activity_maybe_load_mentions_scripts', $retval );
     75         * @param bool $load_mentions True to load mentions assets, false otherwise.
     76         * @param bool $mentions_enabled True if mentions are enabled.
     77         */
     78        return (bool) apply_filters( 'bp_activity_maybe_load_mentions_scripts', $load_mentions, $mentions_enabled );
    8079}
    8180
Note: See TracChangeset for help on using the changeset viewer.