Changeset 5161

Timestamp:

03/22/2017 05:08:21 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Add contextual checks for extra reply actions:

• Don't display "Reply and mark as resolved" checkbox if the topic is already resolved.
• Don't display "Reply and close the topic" checkbox if the topic is already closed.

Fixes #2595. See #2070.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/support-forums/inc/class-hooks.php

@@ -264 +264 @@
          */
         public function add_extra_reply_actions() {
+                $topic_id = bbp_get_topic_id();
+
                 if ( class_exists( 'WordPressdotorg\Forums\Topic_Resolution\Plugin' ) ) :
                         $topic_resolution_plugin = Topic_Resolution\Plugin::get_instance();
 
-                        if ( $topic_resolution_plugin->is_enabled_on_forum() && $topic_resolution_plugin->user_can_resolve( get_current_user_id(), bbp_get_topic_id() ) ) : ?>
+                        if (
+                                $topic_resolution_plugin->is_enabled_on_forum()
+                        &&
+                                $topic_resolution_plugin->user_can_resolve( get_current_user_id(), $topic_id )
+                        &&
+                                'yes' !== $topic_resolution_plugin->get_topic_resolution( array( 'id' => $topic_id ) )
+                        ) : ?>
                                 <p>
                                         <input name="bbp_reply_mark_resolved" id="bbp_reply_mark_resolved" type="checkbox" value="yes" />
@@ -276 +284 @@
                 endif;
 
-                if ( current_user_can( 'moderate', bbp_get_topic_id() ) ) : ?>
+                if ( current_user_can( 'moderate', $topic_id ) && ! bbp_is_topic_closed( $topic_id ) ) : ?>
                         <p>
                                 <input name="bbp_reply_close_topic" id="bbp_reply_close_topic" type="checkbox" value="yes" />