Changeset 9243 for trunk/src/bp-activity/bp-activity-functions.php

Timestamp:

12/20/2014 07:58:37 PM (10 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:

• trunk/src/bp-activity/bp-activity-functions.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-functions.php

@@ -65 +65 @@
  */
 function bp_activity_maybe_load_mentions_scripts() {
-    $retval =
-        bp_activity_do_mentions() &&
-        bp_is_user_active() &&
-        ( bp_is_activity_component() || bp_is_blog_page() && is_singular() && comments_open() || is_admin() );
+    $mentions_enabled = bp_activity_do_mentions() && bp_is_user_active();
+    $load_mentions    = $mentions_enabled && ( bp_is_activity_component() || is_admin() );
 
     /**
@@ -75 +73 @@
      * @since BuddyPress (2.1.0)
      *
-     * @param bool $retval True to load mentions assets, false otherwise.
-     */
-    return (bool) apply_filters( 'bp_activity_maybe_load_mentions_scripts', $retval );
+     * @param bool $load_mentions True to load mentions assets, false otherwise.
+     * @param bool $mentions_enabled True if mentions are enabled.
+     */
+    return (bool) apply_filters( 'bp_activity_maybe_load_mentions_scripts', $load_mentions, $mentions_enabled );
 }