Changeset 3505 for branches/plugin/bbp-includes/bbp-extend-akismet.php

Timestamp:

09/10/2011 10:27:19 PM (13 years ago)

Author:

johnjamesjacoby

Message:

API adjustments:

• Refactor _status_ vars into callable functions.
• Audit usage of $bbp global.
• Perform get_class() checks on extensions to avoid errors if global $bbp is overloaded.
• Bump DB version to 175.

File:

• branches/plugin/bbp-includes/bbp-extend-akismet.php (modified) (14 diffs)

branches/plugin/bbp-includes/bbp-extend-akismet.php

@@ -74 +74 @@
      * @param string $post_data
      *
-     * @global bbPress $bbp
-     *
      * @uses get_userdata() To get the user data
      * @uses bbp_filter_anonymous_user_data() To get anonymous user data
@@ -89 +87 @@
      */
     public function check_post( $post_data ) {
-        global $bbp;
 
         // Declare local variables
@@ -96 +93 @@
 
         // Post is not published
-        if ( 'publish' != $post_data['post_status'] )
+        if ( bbp_get_public_status_id() != $post_data['post_status'] )
             return $post_data;
 
@@ -167 +164 @@
 
             // This is spam
-            $post_data['post_status'] = $bbp->spam_status_id;
+            $post_data['post_status'] = bbp_get_spam_status_id();
 
             // We don't want your spam tags here
@@ -192 +189 @@
      * @param int $post_id
      *
-     * @global bbPress $bbp
      * @global WP_Query $wpdb
      * @global string $akismet_api_host
@@ -214 +210 @@
      */
     public function submit_post( $post_id = 0 ) {
-        global $bbp, $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
+        global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
 
         // Innocent until proven guilty
@@ -251 +247 @@
 
         // Bail if we're spamming, but the post_status isn't spam
-        if ( ( 'spam' == $request_type ) && ( $bbp->spam_status_id != $post->post_status ) )
+        if ( ( 'spam' == $request_type ) && ( bbp_get_spam_status_id() != $post->post_status ) )
             return;
 
@@ -404 +400 @@
      * @param object $post
      *
-     * @global bbPress $bbp
      * @global object $this->last_post
      *
@@ -414 +409 @@
      */
     public function update_post_meta( $post_id = 0, $post = false ) {
-        global $bbp;
 
         // Define local variable(s)
@@ -452 +446 @@
 
                     // If post_status isn't the spam status, as expected, leave a note
-                    if ( $post->post_status != $bbp->spam_status_id ) {
+                    if ( $post->post_status != bbp_get_spam_status_id() ) {
                         $this->update_post_history( $post_id, sprintf( __( 'Post status was changed to %s', 'bbpress' ), $post->post_status ), 'status-changed-' . $post->post_status );
                     }
@@ -464 +458 @@
 
                     // If post_status is the spam status, which isn't expected, leave a note
-                    if ( $post->post_status == $bbp->spam_status_id ) {
+                    if ( $post->post_status == bbp_get_spam_status_id() ) {
 
                         // @todo Use wp_blacklist_check()
@@ -554 +548 @@
      * @param int $reply_id
      *
-     * @global bbPress $bbp
-     *
      * @uses bbp_get_reply_id() To get the reply_id
      * @uses bbp_get_topic_id() To get the topic_id
@@ -564 +556 @@
      */
     public function filter_post_terms( $terms = '', $topic_id = 0, $reply_id = 0 ) {
-        global $bbp;
 
         // Validate the reply_id and topic_id
@@ -696 +687 @@
     if ( !defined( 'AKISMET_VERSION' ) ) return;
 
+    // Bail if bbPress is not loaded
+    if ( 'bbPress' !== get_class( $bbp ) ) return;
+
     // Instantiate Akismet for bbPress
     $bbp->extend->akismet = new BBP_Akismet();