Changeset 7379 for trunk/src/includes/extend/buddypress/groups.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/extend/buddypress/groups.php (modified) (2 diffs)

trunk/src/includes/extend/buddypress/groups.php

@@ -1732 +1732 @@
      * @since 2.6.14
      *
-     * @param  object object  Verified object
-     * @param  string $type   Type of variable to check with `is_a()`
-     * @return mixed  $object Verified object if valid, Default or null if invalid
-     */
-    public function rewrite_pagination( $object, $type = '' ) {
+     * @param  object $query  Verified query object
+     * @param  string $type   Type of variable to compare to
+     * @return mixed  Verified object if valid, Default or null if invalid
+     */
+    public function rewrite_pagination( $query, $type = '' ) {
 
         // Bail if wrong global
         if ( 'wp_query' !== $type ) {
-            return $object;
+            return $query;
         }
 
         // Bail if not inside a BuddyPress Group
         if ( ! bp_is_group() ) {
-            return $object;
+            return $query;
         }
 
         // Bail if not inside a BuddyPress Group Forum
         if ( ! bp_is_current_action( 'forum' ) ) {
-            return $object;
+            return $query;
         }
 
@@ -1767 +1767 @@
             }
 
-        // Single Forum
-        } else {
-
-            // Get the page number from 1st position
-            if ( bp_is_action_variable( 'page', 0 ) ) {
-                $page_number = bp_action_variable( 1 );
-            }
+        // Default (Single Forum)
+        } elseif ( bp_is_action_variable( 'page', 0 ) ) {
+            $page_number = bp_action_variable( 1 );
         }
 
         // Bail if no page number
         if ( empty( $page_number ) ) {
-            return $object;
+            return $query;
         }
 
         // Set the 'paged' WP_Query var to the new action-based value
-        $object->set( 'paged', $page_number );
+        $query->set( 'paged', $page_number );
 
         // Return the filtered/modified object
-        return $object;
+        return $query;
     }