Changeset 9243

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

Location:

trunk/src

Files:

• bp-activity/bp-activity-functions.php (modified) (2 diffs)
• bp-core/bp-core-filters.php (modified) (1 diff)

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 );
 }
 

trunk/src/bp-core/bp-core-filters.php

@@ -629 +629 @@
         return $edit_link;
 }
+
+/**
+ * Should BuddyPress load the mentions scripts and related assets, including results to prime the
+ * mentions suggestions?
+ *
+ * @param bool $load_mentions True to load mentions assets, false otherwise.
+ * @param bool $mentions_enabled True if mentions are enabled.
+ * @return bool True if mentions scripts should be loaded.
+ * @since BuddyPress (2.2.0)
+ */
+function bp_maybe_load_mentions_scripts_for_blog_content( $load_mentions, $mentions_enabled ) {
+        if ( ! $mentions_enabled ) {
+                return $load_mentions;
+        }
+
+        if ( $load_mentions || ( bp_is_blog_page() && is_singular() && comments_open() ) ) {
+                return true;
+        }
+
+        return $load_mentions;
+}
+add_filter( 'bp_activity_maybe_load_mentions_scripts', 'bp_maybe_load_mentions_scripts_for_blog_content', 10, 2 );