Changeset 5729

Timestamp:

08/02/2017 03:24:38 AM (8 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Remove 'Stick' link for non-public topics.

See #2795.

Location:

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

Files:

• class-moderators.php (modified) (3 diffs)
• class-stickies-compat.php (modified) (1 diff)

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

@@ -395 +395 @@
         }
 
+        // Remove 'Stick' link for reviews or non-public topics.
+        if ( Plugin::REVIEWS_FORUM_ID == bbp_get_topic_forum_id( $post_id ) || ! bbp_is_topic_public( $post_id ) ) {
+            unset( $r['stick'] );
+        }
+
         // Add 'Archive' link.
         $r['archive'] = $this->get_archive_link( array( 'post_id' => $post_id ) );
@@ -415 +420 @@
         unset( $actions['unapproved'] );
 
-        // Remove 'Stick' link for reviews.
-        if ( Plugin::REVIEWS_FORUM_ID == $post->post_parent ) {
+        // Remove 'Stick' link for reviews or non-public topics.
+        if ( Plugin::REVIEWS_FORUM_ID == bbp_get_topic_forum_id( $post->ID ) || ! bbp_is_topic_public( $post->ID ) ) {
             unset( $actions['stick'] );
         }
-        
 
         return $actions;
@@ -503 +507 @@
                 } else {
                     bbp_unstick_topic( $post->ID );
-                }
+                        }
 
                 return true;

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

@@ -151 +151 @@
         }
         $user_id = get_current_user_id();
-        if ( Plugin::REVIEWS_FORUM_ID != bbp_get_topic_forum_id()
-            &&
-            $this->user_can_stick( $user_id, $this->term->term_id, $topic_id )
-        ) {
+        if ( isset( $r['stick'] ) && $this->user_can_stick( $user_id, $this->term->term_id, $topic_id ) ) {
             $r['stick'] = self::get_stick_link( array( 'topic_id' => $topic_id, 'term_id' => $this->term->term_id ) );
         } else {