Changeset 7379 for trunk/src/includes/forums/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/forums/template.php (modified) (3 diffs)

trunk/src/includes/forums/template.php

@@ -2498 +2498 @@
             $r['selected'] = sanitize_key( $_POST[ $r['select_id'] ] );
 
-        // No Post value was passed
+        // Edit topic
+        } elseif ( bbp_is_forum_edit() ) {
+            $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
+            $r['selected'] = bbp_get_forum_type( $r['forum_id'] );
+
+        // New topic
         } else {
-
-            // Edit topic
-            if ( bbp_is_forum_edit() ) {
-                $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
-                $r['selected'] = bbp_get_forum_type( $r['forum_id'] );
-
-            // New topic
-            } else {
-                $r['selected'] = bbp_get_public_status_id();
-            }
+            $r['selected'] = bbp_get_public_status_id();
         }
     }
@@ -2589 +2585 @@
             $r['selected'] = sanitize_key( $_POST[ $r['select_id'] ] );
 
-        // No Post value was passed
+        // Edit topic
+        } elseif ( bbp_is_forum_edit() ) {
+            $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
+            $r['selected'] = bbp_get_forum_status( $r['forum_id'] );
+
+        // New topic
         } else {
-
-            // Edit topic
-            if ( bbp_is_forum_edit() ) {
-                $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
-                $r['selected'] = bbp_get_forum_status( $r['forum_id'] );
-
-            // New topic
-            } else {
-                $r['selected'] = bbp_get_public_status_id();
-            }
+            $r['selected'] = bbp_get_public_status_id();
         }
     }
@@ -2680 +2672 @@
             $r['selected'] = sanitize_key( $_POST[ $r['select_id'] ] );
 
-        // No Post value was passed
+        // Edit topic
+        } elseif ( bbp_is_forum_edit() ) {
+            $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
+            $r['selected'] = bbp_get_forum_visibility( $r['forum_id'] );
+
+        // New topic
         } else {
-
-            // Edit topic
-            if ( bbp_is_forum_edit() ) {
-                $r['forum_id'] = bbp_get_forum_id( $r['forum_id'] );
-                $r['selected'] = bbp_get_forum_visibility( $r['forum_id'] );
-
-            // New topic
-            } else {
-                $r['selected'] = bbp_get_public_status_id();
-            }
+            $r['selected'] = bbp_get_public_status_id();
         }
     }