Changeset 5358

Timestamp:

04/18/2017 06:00:14 PM (8 years ago)

Author:

SergeyBiryukov

Message:

Support Forums: Rename Stick/Unstick action keys for plugin and theme topics in Stickies_Compat to avoid conflicts with the same actions for regular topics.

See #2747. Fixes #2418.

File:

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

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

@@ -85 +85 @@
         // Bail if the action isn't meant for this function.
         if ( ! in_array( $action, array(
-            'wporg_bbp_stick_topic',
-            'wporg_bbp_unstick_topic',
+            'wporg_bbp_stick_compat_topic',
+            'wporg_bbp_unstick_compat_topic',
         ) ) ) {
             return;
@@ -122 +122 @@
 
         // Stick/unstick the topic.
-        if ( 'wporg_bbp_stick_topic' == $action ) {
+        if ( 'wporg_bbp_stick_compat_topic' == $action ) {
             $success = self::add_sticky( $term->term_id, $topic->ID );
-        } elseif ( 'wporg_bbp_unstick_topic' == $action ) {
+        } elseif ( 'wporg_bbp_unstick_compat_topic' == $action ) {
             $success = self::remove_sticky( $term->term_id, $topic->ID );
         }
@@ -132 +132 @@
         if ( $success && ! is_wp_error( $success ) ) {
             bbp_redirect( $permalink );
-        } elseif ( true === $is_sticky && 'wporg_bbp_stick_topic' == $action ) {
-            bbp_add_error( 'wporg_bbp_stick_topic', __( '<strong>ERROR</strong>: There was a problem sticking that topic!', 'wporg-forums' ) );
-        } elseif ( false === $is_sticky && 'wporg_bbp_unstick_topic' == $action ) {
-            bbp_add_error( 'wporg_bbp_unstick_topic', __( '<strong>ERROR</strong>: There was a problem unsticking that topic!', 'wporg-forums' ) );
+        } elseif ( true === $is_sticky && 'wporg_bbp_stick_compat_topic' == $action ) {
+            bbp_add_error( 'wporg_bbp_stick_compat_topic', __( '<strong>ERROR</strong>: There was a problem sticking that topic!', 'wporg-forums' ) );
+        } elseif ( false === $is_sticky && 'wporg_bbp_unstick_compat_topic' == $action ) {
+            bbp_add_error( 'wporg_bbp_unstick_compat_topic', __( '<strong>ERROR</strong>: There was a problem unsticking that topic!', 'wporg-forums' ) );
         }
     }
@@ -189 +189 @@
         if ( self::is_sticky( $term->term_id, $topic->ID ) ) {
             $text = $r['unstick'];
-            $query_args = array( 'action' => 'wporg_bbp_unstick_topic', 'topic_id' => $topic->ID, 'term_id' => $term->term_id );
+            $query_args = array( 'action' => 'wporg_bbp_unstick_compat_topic', 'topic_id' => $topic->ID, 'term_id' => $term->term_id );
         } else {
             $text = $r['stick'];
-            $query_args = array( 'action' => 'wporg_bbp_stick_topic', 'topic_id' => $topic->ID, 'term_id' => $term->term_id );
+            $query_args = array( 'action' => 'wporg_bbp_stick_compat_topic', 'topic_id' => $topic->ID, 'term_id' => $term->term_id );
         }