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

SergeyBiryukov · SergeyBiryukov · commit e31e5e7f4dcf · 2021-04-20T14:47:02.000Z
* `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. git-svn-id: https://develop.svn.wordpress.org/trunk@50772 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php
@@ -242,7 +242,16 @@
 			<tr>
 				<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.' ); ?>
 					</p>
@@ -254,10 +263,16 @@
 				<td>
 					<?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 );
+						}
 					}
 					?>
 					<textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
@@ -274,8 +289,10 @@
 					<?php
 					$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 );
 					}
 					?>
 					<textarea name="banned_email_domains" id="banned_email_domains" aria-describedby="banned-email-domains-desc" cols="45" rows="5">
