Ticket #2622: 2622.diff

src/includes/admin/topics.php

@@ -502 +502 @@
 
                                         $is_sticky = bbp_is_topic_sticky( $topic_id );
                                         $is_super  = false === $is_sticky && !empty( $_GET['super'] ) && ( "1" === $_GET['super'] ) ? true : false;
-                                        $message   = true  === $is_sticky ? 'unsticked'     : 'sticked';
-                                        $message   = true  === $is_super  ? 'super_sticked' : $message;
+                                        $message   = true  === $is_sticky ? 'unstuck'     : 'stuck';
+                                        $message   = true  === $is_super  ? 'super_sticky' : $message;
                                         $success   = true  === $is_sticky ? bbp_unstick_topic( $topic_id ) : bbp_stick_topic( $topic_id, $is_super );
 
                                         break;
@@ -554 +554 @@
                 if ( $this->bail() ) return;
 
                 // Only proceed if GET is a topic toggle action
-                if ( bbp_is_get_request() && !empty( $_GET['bbp_topic_toggle_notice'] ) && in_array( $_GET['bbp_topic_toggle_notice'], array( 'opened', 'closed', 'super_sticked', 'sticked', 'unsticked', 'spammed', 'unspammed' ) ) && !empty( $_GET['topic_id'] ) ) {
+                if ( bbp_is_get_request() && !empty( $_GET['bbp_topic_toggle_notice'] ) && in_array( $_GET['bbp_topic_toggle_notice'], array( 'opened', 'closed', 'super_sticky', 'stuck', 'unstuck', 'spammed', 'unspammed' ) ) && !empty( $_GET['topic_id'] ) ) {
                         $notice     = $_GET['bbp_topic_toggle_notice'];         // Which notice?
                         $topic_id   = (int) $_GET['topic_id'];                  // What's the topic id?
                         $is_failure = !empty( $_GET['failed'] ) ? true : false; // Was that a failure?
@@ -579 +579 @@
                                         $message = $is_failure === true ? sprintf( __( 'There was a problem closing the topic "%1$s".',           'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully closed.',           'bbpress' ), $topic_title );
                                         break;
 
-                                case 'super_sticked' :
-                                        $message = $is_failure === true ? sprintf( __( 'There was a problem sticking the topic "%1$s" to front.', 'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully sticked to front.', 'bbpress' ), $topic_title );
+                                case 'super_sticky' :
+                                        $message = $is_failure === true ? sprintf( __( 'There was a problem sticking the topic "%1$s" to front.', 'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully stuck to front.', 'bbpress' ), $topic_title );
                                         break;
 
-                                case 'sticked'   :
-                                        $message = $is_failure === true ? sprintf( __( 'There was a problem sticking the topic "%1$s".',          'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully sticked.',          'bbpress' ), $topic_title );
+                                case 'stuck'   :
+                                        $message = $is_failure === true ? sprintf( __( 'There was a problem sticking the topic "%1$s".',          'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully stuck.',          'bbpress' ), $topic_title );
                                         break;
 
-                                case 'unsticked' :
-                                        $message = $is_failure === true ? sprintf( __( 'There was a problem unsticking the topic "%1$s".',        'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully unsticked.',        'bbpress' ), $topic_title );
+                                case 'unstuck' :
+                                        $message = $is_failure === true ? sprintf( __( 'There was a problem unsticking the topic "%1$s".',        'bbpress' ), $topic_title ) : sprintf( __( 'Topic "%1$s" successfully unstuck.',        'bbpress' ), $topic_title );
                                         break;
 
                                 case 'spammed'   :