Changeset 11102 for trunk/src/bp-activity/bp-activity-actions.php

Timestamp:

09/14/2016 05:06:11 PM (8 years ago)

Author:

r-a-y

Message:

Activity: Move Akismet loader to bp-activity-akismet.php.

Previously, bp_activity_setup_akismet() was placed in
bp-activity-actions.php. The actions file isn't a proper place to put
this code.

This commit moves this function to bp-activity-akismet.php and also
removes some duplicate conditional code. BP_Activity_Component already
checks if Akismet is loaded, so no need to re-duplicate this logic.

This is part of some prep work to conditionally load a component's action
and screen code when necessary.

See #7218.

File:

• trunk/src/bp-activity/bp-activity-actions.php (modified) (1 diff)

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

@@ -604 +604 @@
 }
 add_action( 'bp_actions', 'bp_activity_action_favorites_feed' );
-
-/**
- * Loads Akismet filtering for activity.
- *
- * @since 1.6.0
- * @since 2.3.0 We only support Akismet 3+.
- */
-function bp_activity_setup_akismet() {
-    $bp = buddypress();
-
-    // Bail if Akismet is not active.
-    if ( ! defined( 'AKISMET_VERSION' ) ) {
-        return;
-    }
-
-    // Bail if older version of Akismet.
-    if ( ! class_exists( 'Akismet' ) ) {
-        return;
-    }
-
-    // Bail if no Akismet key is set.
-    if ( ! bp_get_option( 'wordpress_api_key' ) && ! defined( 'WPCOM_API_KEY' ) ) {
-        return;
-    }
-
-    /**
-     * Filters if BuddyPress Activity Akismet support has been disabled by another plugin.
-     *
-     * @since 1.6.0
-     *
-     * @param bool $value Return value of bp_is_akismet_active boolean function.
-     */
-    if ( ! apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
-        return;
-    }
-
-    // Instantiate Akismet for BuddyPress.
-    $bp->activity->akismet = new BP_Akismet();
-}
 
 /**