Changeset 50772

Timestamp:

04/20/2021 02:47:02 PM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Bring consistency to preparing some fields on Network Settings screen:

• illegal_names
• limited_email_domains
• banned_email_domains

If any of these options have a falsey value, treat it as an empty string. This addresses a PHP 8.1+ deprecation notice when passing a null value to str_replace().

Additionally, avoid unnecessary type casting for better performance.

Props hellofromTonya, jrf, SergeyBiryukov.
See #51423.

File:

• trunk/src/wp-admin/network/settings.php (modified) (3 diffs)

trunk/src/wp-admin/network/settings.php

@@ -243 +243 @@
                                 <th scope="row"><label for="illegal_names"><?php _e( 'Banned Names' ); ?></label></th>
                                 <td>
-                                        <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( implode( ' ', (array) get_site_option( 'illegal_names' ) ) ); ?>" size="45" />
+                                        <?php
+                                        $illegal_names = get_site_option( 'illegal_names' );
+
+                                        if ( empty( $illegal_names ) ) {
+                                                $illegal_names = '';
+                                        } elseif ( is_array( $illegal_names ) ) {
+                                                $illegal_names = implode( ' ', $illegal_names );
+                                        }
+                                        ?>
+                                        <input name="illegal_names" type="text" id="illegal_names" aria-describedby="illegal-names-desc" class="large-text" value="<?php echo esc_attr( $illegal_names ); ?>" size="45" />
                                         <p class="description" id="illegal-names-desc">
                                                 <?php _e( 'Users are not allowed to register these sites. Separate names by spaces.' ); ?>
@@ -255 +264 @@
                                         <?php
                                         $limited_email_domains = get_site_option( 'limited_email_domains' );
-                                        $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
-
-                                        if ( $limited_email_domains ) {
-                                                $limited_email_domains = implode( "\n", (array) $limited_email_domains );
+
+                                        if ( empty( $limited_email_domains ) ) {
+                                                $limited_email_domains = '';
+                                        } else {
+                                                // Convert from an input field. Back-compat for WPMU < 1.0.
+                                                $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
+
+                                                if ( is_array( $limited_email_domains ) ) {
+                                                        $limited_email_domains = implode( "\n", $limited_email_domains );
+                                                }
                                         }
                                         ?>
@@ -275 +290 @@
                                         $banned_email_domains = get_site_option( 'banned_email_domains' );
 
-                                        if ( $banned_email_domains ) {
-                                                $banned_email_domains = implode( "\n", (array) $banned_email_domains );
+                                        if ( empty( $banned_email_domains ) ) {
+                                                $banned_email_domains = '';
+                                        } elseif ( is_array( $banned_email_domains ) ) {
+                                                $banned_email_domains = implode( "\n", $banned_email_domains );
                                         }
                                         ?>