Changeset 4048

Timestamp:

09/13/2016 06:25:56 PM (8 years ago)

Author:

jmdodd

Message:

Support Forums: Remove topic/reply author from subscription email list.

Moves bail on other action to first step of subscription handler.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/wporg-bbp-term-subscription/inc/class-plugin.php

@@ -59 +59 @@
      */
     public function term_subscribe_handler( $action = '' ) {
-        if ( ! $this->taxonomy ) {
-            return;
-        }
-
-        // Taxonomy mismatch; a different instance should handle this.
-        if ( $this->taxonomy != $_GET['taxonomy'] ) {
-            return;
-        }
-
-        if ( ! bbp_is_subscriptions_active() ) {
-            return false;
-        }
-
         // Bail if the actions aren't meant for this function.
         if ( ! in_array( $action, self::get_valid_actions() ) ) {
@@ -77 +64 @@
         }
 
+        if ( ! $this->taxonomy ) {
+            return;
+        }
+
+        // Taxonomy mismatch; a different instance should handle this.
+        if ( ! isset( $_GET['taxonomy'] ) || $this->taxonomy != $_GET['taxonomy'] ) {
+            return;
+        }
+
+        if ( ! bbp_is_subscriptions_active() ) {
+            return false;
+        }
+
+        // Bail if the actions aren't meant for this function.
+        if ( ! in_array( $action, self::get_valid_actions() ) ) {
+            return;
+        }
+
         // Bail if no term id is passed.
-        if ( empty( $_GET['term_id'] ) || empty( $_GET['taxonomy'] ) ) {
+        if ( ! isset( $_GET['term_id'] ) || empty( $_GET['term_id'] ) ) {
             return;
         }
@@ -160 +165 @@
         }
 
+        // Remove the author from being notified of their own topic.
+        $this->subscribers = array_diff( $this->subscribers, array( bbp_get_topic_author_id( $topic_id ) ) );
+
         if ( empty( $this->subscribers ) ) {
             return;
@@ -252 +260 @@
             $this->subscribers = array_diff( $this->subscribers, $topic_subscribers );
         }
+
+        // Remove the author from being notified of their own reply.
+        $this->subscribers = array_diff( $this->subscribers, array( bbp_get_reply_author_id( $reply_id ) ) );
 
         if ( empty( $this->subscribers ) ) {