Changeset 11102 for trunk/src/bp-activity/classes/class-bp-activity-component.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/classes/class-bp-activity-component.php (modified) (2 diffs)

trunk/src/bp-activity/classes/class-bp-activity-component.php

@@ -73 +73 @@
         $akismet_key = bp_get_option( 'wordpress_api_key' );
 
-        /** This filter is documented in bp-activity/bp-activity-actions.php */
+        /** This filter is documented in bp-activity/bp-activity-akismet.php */
         if ( defined( 'AKISMET_VERSION' ) && class_exists( 'Akismet' ) && ( ! empty( $akismet_key ) || defined( 'WPCOM_API_KEY' ) ) && apply_filters( 'bp_activity_use_akismet', bp_is_akismet_active() ) ) {
             $includes[] = 'akismet';
@@ -371 +371 @@
 
     /**
-     * Set up actions necessary for the component.
-     *
-     * @since 1.6.0
-     */
-    public function setup_actions() {
-
-        // Spam prevention.
-        add_action( 'bp_include', 'bp_activity_setup_akismet' );
-
-        parent::setup_actions();
-    }
-
-    /**
      * Setup cache groups.
      *