Changeset 7379 for trunk/src/includes/topics/template.php

Timestamp:

11/24/2025 07:23:06 PM (6 months ago)

Author:

johnjamesjacoby

Message:

Tools - Code Improvement: stop ignoring these PHPCS sniffs:

• PEAR.Files.IncludingFile.UseRequire
• PSR2.ControlStructures.SwitchDeclaration.BodyOnNextLineDEFAULT
• PSR2.Methods.FunctionClosingBrace.SpacingBeforeClose
• Squiz.ControlStructures.ControlSignature.NewlineAfterOpenBrace
• Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure
• Squiz.PHP.EmbeddedPhp.MultipleStatements
• Squiz.PHP.NonExecutableCode.Unreachable
• Universal.Arrays.DuplicateArrayKey.Found
• Universal.ControlStructures.DisallowLonelyIf.Found
• WordPress.PHP.NoSilencedErrors.Discouraged

This commit includes code formatting changes for the above sniffs.

See #3658.

File:

• trunk/src/includes/topics/template.php (modified) (2 diffs)

trunk/src/includes/topics/template.php

@@ -3316 +3316 @@
                 $r['selected'] = sanitize_key( $_POST[ $r['select_id'] ] );
 
-            // No Post value passed
-            } else {
-
-                // Edit topic
-                if ( bbp_is_single_topic() || bbp_is_topic_edit() ) {
-
-                    // Get current topic id
-                    $r['topic_id'] = bbp_get_topic_id( $r['topic_id'] );
-
-                    // Topic is super sticky
-                    if ( bbp_is_topic_super_sticky( $r['topic_id'] ) ) {
-                        $r['selected'] = 'super';
-
-                    // Topic is sticky or normal
-                    } else {
-                        $r['selected'] = bbp_is_topic_sticky( $r['topic_id'], false )
-                            ? 'stick'
-                            : 'unstick';
-                    }
+            // Edit topic
+            } elseif ( bbp_is_single_topic() || bbp_is_topic_edit() ) {
+
+                // Get current topic id
+                $r['topic_id'] = bbp_get_topic_id( $r['topic_id'] );
+
+                // Topic is super sticky
+                if ( bbp_is_topic_super_sticky( $r['topic_id'] ) ) {
+                    $r['selected'] = 'super';
+
+                // Topic is sticky or normal
+                } else {
+                    $r['selected'] = bbp_is_topic_sticky( $r['topic_id'], false )
+                        ? 'stick'
+                        : 'unstick';
                 }
             }
@@ -3409 +3405 @@
                 $r['selected'] = sanitize_key( $_POST[ $r['select_id'] ] );
 
-            // No Post value was passed
+            // Edit topic
+            } elseif ( bbp_is_topic_edit() ) {
+                $r['topic_id'] = bbp_get_topic_id( $r['topic_id'] );
+                $r['selected'] = bbp_get_topic_status( $r['topic_id'] );
+
+            // New topic
             } else {
-
-                // Edit topic
-                if ( bbp_is_topic_edit() ) {
-                    $r['topic_id'] = bbp_get_topic_id( $r['topic_id'] );
-                    $r['selected'] = bbp_get_topic_status( $r['topic_id'] );
-
-                // New topic
-                } else {
-                    $r['selected'] = bbp_get_public_status_id();
-                }
+                $r['selected'] = bbp_get_public_status_id();
             }
         }