Changeset 13906

Timestamp:

06/06/2024 01:57:37 AM (3 months ago)

Author:

espellcaste

Message:

WPCS: fix a regression that stopped the BuddyPress components from being saved properly.

The regression was introduced as part of [13881] where "bp_components[ $name ]" was incorectly changed (added a space around it). The values sent to the database had a space before and after the component key: " groups " instead of "groups", and it was saved in the bp-active-components field as such.

The correct value should continue to be "bp_components[$name]", since this is not an array key (even though it looks like one).

See #7228

File:

• trunk/src/bp-core/admin/bp-core-admin-components.php (modified) (6 diffs)

trunk/src/bp-core/admin/bp-core-admin-components.php

@@ -55 +55 @@
      * @since 1.5.0
      *
-     * @param mixed $value Active components.
+     * @param mixed $active_components Active components.
      */
     $active_components = apply_filters( 'bp_active_components', bp_get_option( 'bp-active-components' ) );
@@ -184 +184 @@
         ),
     );
+
+    $component_anchor_url = function ( $component_action, $component_view ) use ( $page, $action ) {
+        $component_url = add_query_arg(
+            array(
+                'page'   => 'bp-components',
+                'action' => $component_action,
+            ),
+            bp_get_admin_url( $page )
+        );
+
+        $css = $component_action === $action ? 'class="current"' : '';
+
+        return sprintf(
+            '<a href="%s" %s>%s</a>',
+            esc_url( $component_url ),
+            $css,
+            wp_kses( $component_view, array( 'span' => array( 'class' => true ) ) )
+        );
+    }
     ?>
 
     <h3 class="screen-reader-text">
-        <?php
-            /* translators: accessibility text */
-            esc_html_e( 'Filter components list', 'buddypress' );
-        ?>
+        <?php esc_html_e( 'Filter components list', 'buddypress' ); ?>
     </h3>
 
@@ -196 +212 @@
         <?php foreach ( $component_views as $component_view ) : ?>
             <li>
-                <a href="
-                <?php
-                echo esc_url(
-                    add_query_arg(
-                        array(
-                            'page'   => 'bp-components',
-                            'action' => $component_view['action'],
-                        ),
-                        bp_get_admin_url( $page )
-                    )
-                );
-                ?>
-                            "
-            <?php
-            if ( $action === $component_view['action'] ) :
-                ?>
-                    class="current"<?php endif; ?>>
-                    <?php echo wp_kses( $component_view['view'], array( 'span' => array( 'class' => true ) ) ); ?>
-                </a><?php echo 'retired' !== $component_view['action'] ? ' |' : ''; ?>
+                <?php echo $component_anchor_url( $component_view['action'], $component_view['view'] ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
+                <?php echo 'retired' !== $component_view['action'] ? ' |' : ''; ?>
             </li>
         <?php endforeach; ?>
@@ -220 +219 @@
 
     <h3 class="screen-reader-text">
-        <?php
-            /* translators: accessibility text */
-            esc_html_e( 'Components list', 'buddypress' );
-        ?>
+        <?php esc_html_e( 'Components list', 'buddypress' ); ?>
     </h3>
 
@@ -263 +259 @@
                                 <input
                                     type="checkbox"
-                                    id="<?php echo esc_attr( "bp_components[ $name ]" ); ?>"
-                                    name="<?php echo esc_attr( "bp_components[ $name ]" ); ?>"
+                                    id="<?php echo esc_attr( "bp_components[$name]" ); ?>"
+                                    name="<?php echo esc_attr( "bp_components[$name]" ); ?>"
                                     value="1"<?php checked( isset( $active_components[ esc_attr( $name ) ] ) ); ?>
                                 />
-                                <label for="<?php echo esc_attr( "bp_components[ $name ]" ); ?>" class="screen-reader-text">
+                                <label for="<?php echo esc_attr( "bp_components[$name]" ); ?>" class="screen-reader-text">
                                     <?php
                                         /* translators: accessibility text */
@@ -278 +274 @@
                         </th>
                         <td class="plugin-title column-primary">
-                            <label for="<?php echo esc_attr( "bp_components[ $name ]" ); ?>">
+                            <label for="<?php echo esc_attr( "bp_components[$name]" ); ?>">
                                 <span aria-hidden="true"></span>
                                 <strong><?php echo esc_html( $labels['title'] ); ?></strong>