Changeset 6830

Timestamp:

07/05/2018 04:11:03 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Subscriptions: simplify edit logic for getting checked() value.

Props wpdennis. See #3206.

Location:

trunk/src/includes

Files:

• forums/template.php (modified) (2 diffs)
• topics/template.php (modified) (2 diffs)

trunk/src/includes/forums/template.php

@@ -2227 +2227 @@
         function bbp_get_form_forum_subscribed() {
 
+                // Default value
+                $forum_subscribed = false;
+
                 // Get _POST data
                 if ( bbp_is_forum_form_post_request() && isset( $_POST['bbp_forum_subscription'] ) ) {
@@ -2233 +2236 @@
                 // Get edit data
                 } elseif ( bbp_is_forum_edit() || bbp_is_reply_edit() ) {
-
-                        // Get current posts author
-                        $post_author = (int) bbp_get_global_post_field( 'post_author', 'raw' );
-
-                        // Post author is not the current user
-                        if ( bbp_get_current_user_id() !== $post_author ) {
-                                $forum_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_forum_id() );
-
-                        // Post author is the current user
-                        } else {
-                                $forum_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_forum_id() );
-                        }
+                        $post_author      = (int) bbp_get_global_post_field( 'post_author', 'raw' );
+                        $forum_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_forum_id() );
 
                 // Get current status
                 } elseif ( bbp_is_single_forum() ) {
                         $forum_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_forum_id() );
-
-                // No data
-                } else {
-                        $forum_subscribed = false;
                 }
 

trunk/src/includes/topics/template.php

@@ -3846 +3846 @@
         function bbp_get_form_topic_subscribed() {
 
+                // Default value
+                $topic_subscribed = false;
+
                 // Get _POST data
                 if ( bbp_is_topic_form_post_request() && isset( $_POST['bbp_topic_subscription'] ) ) {
@@ -3852 +3855 @@
                 // Get edit data
                 } elseif ( bbp_is_topic_edit() || bbp_is_reply_edit() ) {
-
-                        // Get current posts author
-                        $post_author = (int) bbp_get_global_post_field( 'post_author', 'raw' );
-
-                        // Post author is not the current user
-                        if ( bbp_get_current_user_id() !== $post_author ) {
-                                $topic_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_topic_id() );
-
-                        // Post author is the current user
-                        } else {
-                                $topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_topic_id() );
-                        }
+                        $post_author      = (int) bbp_get_global_post_field( 'post_author', 'raw' );
+                        $topic_subscribed = bbp_is_user_subscribed( $post_author, bbp_get_topic_id() );
 
                 // Get current status
                 } elseif ( bbp_is_single_topic() ) {
                         $topic_subscribed = bbp_is_user_subscribed( bbp_get_current_user_id(), bbp_get_topic_id() );
-
-                // No data
-                } else {
-                        $topic_subscribed = false;
                 }