Changeset 61187

Timestamp:

11/09/2025 11:01:32 PM (3 months ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use more meaningful variable names in Classic Widgets screen.

Per the ​Naming Conventions:

Don’t abbreviate variable names unnecessarily; let the code be unambiguous and self-documenting.

This commit includes renaming of the following variables:

• $sbname to $sidebar_name.
• $sbvalue to $sidebar_data.
• $j to $widget_count.
• $i to $sidebar_index.
• $sb to $sidebar.
• $key to $sidebar_id.

Follow-up to [10912], [11009], [11427], [26285], [50997].

Props costdev, mukesh27.
See #63168.

File:

• trunk/src/wp-admin/widgets-form.php (modified) (6 diffs)

trunk/src/wp-admin/widgets-form.php

@@ -188 +188 @@
     // Remove old position.
     if ( ! isset( $_POST['delete_widget'] ) ) {
-        foreach ( $sidebars_widgets as $key => $sb ) {
-            if ( is_array( $sb ) ) {
-                $sidebars_widgets[ $key ] = array_diff( $sb, array( $widget_id ) );
+        foreach ( $sidebars_widgets as $sidebar_id => $sidebar ) {
+            if ( is_array( $sidebar ) ) {
+                $sidebars_widgets[ $sidebar_id ] = array_diff( $sidebar, array( $widget_id ) );
             }
         }
+
         array_splice( $sidebars_widgets[ $sidebar_id ], $position, 0, $widget_id );
     }
@@ -236 +237 @@
             foreach ( $wp_registered_widget_controls as $control ) {
                 if ( $_GET['base'] === $control['id_base'] ) {
-                    $control_callback                                = $control['callback'];
-                    $multi_number                                    = (int) $_GET['num'];
-                    $control['params'][0]['number']                  = -1;
-                    $control['id']                                   = $control['id_base'] . '-' . $multi_number;
-                    $widget_id                                       = $control['id'];
+                    $control_callback               = $control['callback'];
+                    $multi_number                   = (int) $_GET['num'];
+                    $control['params'][0]['number'] = -1;
+                    $control['id']                  = $control['id_base'] . '-' . $multi_number;
+                    $widget_id                      = $control['id'];
+
                     $wp_registered_widget_controls[ $control['id'] ] = $control;
                     break;
@@ -300 +302 @@
     <table class="widefat"><thead><tr><th><?php _e( 'Sidebar' ); ?></th><th><?php _e( 'Position' ); ?></th></tr></thead><tbody>
     <?php
-    foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-        echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sbname ) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-        if ( 'wp_inactive_widgets' === $sbname || str_starts_with( $sbname, 'orphaned_widgets' ) ) {
+    foreach ( $wp_registered_sidebars as $sidebar_name => $sidebar_data ) {
+        echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr( $sidebar_name ) . "'" .
+            checked( $sidebar_name, $sidebar, false ) . " /> $sidebar_data[name]</label></td><td>";
+
+        if ( 'wp_inactive_widgets' === $sidebar_name || str_starts_with( $sidebar_name, 'orphaned_widgets' ) ) {
             echo '&nbsp;';
         } else {
-            if ( ! isset( $sidebars_widgets[ $sbname ] ) || ! is_array( $sidebars_widgets[ $sbname ] ) ) {
-                $j                           = 1;
-                $sidebars_widgets[ $sbname ] = array();
+            if ( ! isset( $sidebars_widgets[ $sidebar_name ] ) || ! is_array( $sidebars_widgets[ $sidebar_name ] ) ) {
+                $widget_count = 1;
+
+                $sidebars_widgets[ $sidebar_name ] = array();
             } else {
-                $j = count( $sidebars_widgets[ $sbname ] );
-                if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
-                    ++$j;
+                $widget_count = count( $sidebars_widgets[ $sidebar_name ] );
+
+                if ( isset( $_GET['addnew'] ) || ! in_array( $widget_id, $sidebars_widgets[ $sidebar_name ], true ) ) {
+                    ++$widget_count;
                 }
             }
+
             $selected = '';
-            echo "\t\t<select name='{$sbname}_position'>\n";
+
+            echo "\t\t<select name='{$sidebar_name}_position'>\n";
             echo "\t\t<option value=''>" . __( '&mdash; Select &mdash;' ) . "</option>\n";
-            for ( $i = 1; $i <= $j; $i++ ) {
-                if ( in_array( $widget_id, $sidebars_widgets[ $sbname ], true ) ) {
+
+            for ( $i = 1; $i <= $widget_count; $i++ ) {
+                if ( in_array( $widget_id, $sidebars_widgets[ $sidebar_name ], true ) ) {
                     $selected = selected( $i, $key + 1, false );
                 }
+
                 echo "\t\t<option value='$i'$selected> $i </option>\n";
             }
+
             echo "\t\t</select>\n";
         }
+
         echo "</td></tr>\n";
     }
@@ -513 +525 @@
 <?php
 
-$i                    = 0;
+$sidebar_index        = 0;
 $split                = 0;
 $single_sidebar_class = '';
@@ -536 +548 @@
     }
 
-    if ( $i > 0 ) {
+    if ( $sidebar_index > 0 ) {
         $wrap_class .= ' closed';
     }
 
-    if ( $split && $i === $split ) {
+    if ( $split && $sidebar_index === $split ) {
         ?>
         </div><div class="sidebars-column-2">
@@ -555 +567 @@
     <?php
 
-    ++$i;
+    ++$sidebar_index;
 }