Changeset 6143

Timestamp:

12/08/2016 05:05:57 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Topics: Break apart some lengthy inline conditions. See #3032.

File:

• trunk/src/includes/topics/functions.php (modified) (5 diffs)

trunk/src/includes/topics/functions.php

@@ -2253 +2253 @@
 
             $is_pending         = bbp_is_topic_pending( $r['id'] );
-            $retval['status']   = true === $is_pending ? bbp_approve_topic( $r['id'] ) : bbp_unapprove_topic( $r['id'] );
-            $retval['message']  = true === $is_pending ? __( '<strong>ERROR</strong>: There was a problem approving the topic.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem unapproving the topic.', 'bbpress' );
             $retval['view_all'] = ! $is_pending;
+
+            // Toggle
+            $retval['status'] = ( true === $is_pending )
+                ? bbp_approve_topic( $r['id'] )
+                : bbp_unapprove_topic( $r['id'] );
+            
+            // Feedback
+            $retval['message'] = ( true === $is_pending )
+                ? __( '<strong>ERROR</strong>: There was a problem approving the topic.',   'bbpress' )
+                : __( '<strong>ERROR</strong>: There was a problem unapproving the topic.', 'bbpress' );
 
             break;
@@ -2263 +2271 @@
             check_ajax_referer( "close-{$nonce_suffix}" );
 
-            $is_open           = bbp_is_topic_open( $r['id'] );
-            $retval['status']  = true === $is_open ? bbp_close_topic( $r['id'] ) : bbp_open_topic( $r['id'] );
-            $retval['message'] = true === $is_open ? __( '<strong>ERROR</strong>: There was a problem closing the topic.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem opening the topic.', 'bbpress' );
+            $is_open = bbp_is_topic_open( $r['id'] );
+
+            // Toggle
+            $retval['status'] = ( true === $is_open )
+                ? bbp_close_topic( $r['id'] )
+                : bbp_open_topic( $r['id'] );
+
+            // Feedback
+            $retval['message'] = ( true === $is_open )
+                ? __( '<strong>ERROR</strong>: There was a problem closing the topic.', 'bbpress' )
+                : __( '<strong>ERROR</strong>: There was a problem opening the topic.', 'bbpress' );
 
             break;
@@ -2273 +2289 @@
             check_ajax_referer( "stick-{$nonce_suffix}" );
 
-            $is_sticky         = bbp_is_topic_sticky( $r['id'] );
-            $is_super          = false === $is_sticky && ! empty( $_GET['super'] ) && ( "1" === $_GET['super'] ) ? true : false;
-            $retval['status']  = true  === $is_sticky ? bbp_unstick_topic( $r['id'] ) : bbp_stick_topic( $r['id'], $is_super );
-            $retval['message'] = true  === $is_sticky ? __( '<strong>ERROR</strong>: There was a problem unsticking the topic.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem sticking the topic.', 'bbpress' );
+            $is_sticky = bbp_is_topic_sticky( $r['id'] );
+            $is_super  = false === $is_sticky && ! empty( $_GET['super'] ) && ( "1" === $_GET['super'] ) ? true : false;
+            
+            // Toggle
+            $retval['status'] = ( true === $is_sticky )
+                ? bbp_unstick_topic( $r['id'] )
+                : bbp_stick_topic( $r['id'], $is_super );
+
+            // Feedback
+            $retval['message'] = ( true === $is_sticky )
+                ? __( '<strong>ERROR</strong>: There was a problem unsticking the topic.', 'bbpress' )
+                : __( '<strong>ERROR</strong>: There was a problem sticking the topic.',   'bbpress' );
 
             break;
@@ -2285 +2309 @@
 
             $is_spam            = bbp_is_topic_spam( $r['id'] );
-            $retval['status']   = true === $is_spam ? bbp_unspam_topic( $r['id'] ) : bbp_spam_topic( $r['id'] );
-            $retval['message']  = true === $is_spam ? __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'bbpress' ) : __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.', 'bbpress' );
             $retval['view_all'] = ! $is_spam;
+
+            // Toggle
+            $retval['status'] = ( true === $is_spam )
+                ? bbp_unspam_topic( $r['id'] )
+                : bbp_spam_topic( $r['id'] );
+
+            // Feedback
+            $retval['message'] = ( true === $is_spam )
+                ? __( '<strong>ERROR</strong>: There was a problem unmarking the topic as spam.', 'bbpress' )
+                : __( '<strong>ERROR</strong>: There was a problem marking the topic as spam.',   'bbpress' );
 
             break;
@@ -2298 +2330 @@
                     check_ajax_referer( "trash-{$nonce_suffix}" );
 
-                    $view_all = true;
-                    $retval['status']  = wp_trash_post( $r['id'] );
-                    $retval['message'] = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
+                    $retval['view_all'] = true;
+                    $retval['status']   = wp_trash_post( $r['id'] );
+                    $retval['message']  = __( '<strong>ERROR</strong>: There was a problem trashing the topic.', 'bbpress' );
 
                     break;