Changeset 53713

Timestamp:

07/17/2022 01:36:27 AM (2 years ago)

Author:

SergeyBiryukov

Message:

Coding Standards: Use a single input array on Permalink Settings screen.

This reduces the amount of code to edit in case of any changes to the default permalink structures.

Follow-up to [53706], [53710].

See #55647, #55498.

File:

• trunk/src/wp-admin/options-permalink.php (modified) (3 diffs)

trunk/src/wp-admin/options-permalink.php

@@ -239 +239 @@
 }
 
+$url_base = home_url( $blog_prefix . $index_php_prefix );
+
 $default_structures = array(
-    0 => '',
-    1 => $index_php_prefix . '/%year%/%monthnum%/%day%/%postname%/',
-    2 => $index_php_prefix . '/%year%/%monthnum%/%postname%/',
-    3 => $index_php_prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
-    4 => $index_php_prefix . '/%postname%/',
-);
-
-$url_base = home_url( $blog_prefix . $index_php_prefix );
-
-$default_structure_inputs = array(
-    0 => array(
+    array(
         'id'      => 'plain',
         'label'   => __( 'Plain' ),
+        'value'   => '',
         'example' => home_url( '/?p=123' ),
-        'value'   => $default_structures[0],
     ),
-    1 => array(
+    array(
         'id'      => 'day-name',
         'label'   => __( 'Day and name' ),
+        'value'   => $index_php_prefix . '/%year%/%monthnum%/%day%/%postname%/',
         'example' => $url_base . '/' . gmdate( 'Y/m/d' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
-        'value'   => $default_structures[1],
     ),
-    2 => array(
+    array(
         'id'      => 'month-name',
         'label'   => __( 'Month and name' ),
+        'value'   => $index_php_prefix . '/%year%/%monthnum%/%postname%/',
         'example' => $url_base . '/' . gmdate( 'Y/m' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
-        'value'   => $default_structures[2],
     ),
-    3 => array(
-        'id'      => 'day-numeric',
+    array(
+        'id'      => 'numeric',
         'label'   => __( 'Numeric' ),
+        'value'   => $index_php_prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
         'example' => $url_base . '/' . _x( 'archives', 'sample permalink base' ) . '/123',
-        'value'   => $default_structures[3],
     ),
-    4 => array(
+    array(
         'id'      => 'post-name',
         'label'   => __( 'Post name' ),
+        'value'   => $index_php_prefix . '/%postname%/',
         'example' => $url_base . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
-        'value'   => $default_structures[4],
     ),
 );
+
+$default_structure_values = wp_list_pluck( $default_structures, 'value' );
 
 $available_tags = array(
@@ -337 +331 @@
         <fieldset class="structure-selection">
             <legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
-            <?php foreach ( $default_structure_inputs as $input ) : ?>
+            <?php foreach ( $default_structures as $input ) : ?>
             <div class="row">
                 <input id="permalink-input-<?php echo $input['id']; ?>"
@@ -356 +350 @@
                 <input id="custom_selection"
                     name="selection" type="radio" value="custom"
-                    <?php checked( ! in_array( $permalink_structure, $default_structures, true ) ); ?>
+                    <?php checked( ! in_array( $permalink_structure, $default_structure_values, true ) ); ?>
                 />
                 <div>