Refactor HTML to improve consistency/readability and reduce duplication

westonruter · westonruter · commit 0a05fed07175 · 2025-12-09T11:20:33.000-08:00
diff --git a/src/wp-admin/network/site-new.php b/src/wp-admin/network/site-new.php
@@ -217,21 +217,18 @@
 				</label>
 			</th>
 			<td>
-			<?php if ( is_subdomain_install() ) { ?>
 				<span class="code">
-					<input name="blog[domain]" type="text" class="regular-text code" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><code class="no-break">.<?php echo preg_replace( '|^www\.|', '', get_network()->domain ); ?></code>
+					<?php if ( is_subdomain_install() ) : ?>
+						<input name="blog[domain]" type="text" class="regular-text code" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required /><!--
+						--><code class="no-break"><?php echo esc_html( '.' . preg_replace( '|^www\.|', '', get_network()->domain ) ); ?></code>
+					<?php else : ?>
+						<code class="no-break"><?php echo esc_html( get_network()->domain . get_network()->path ); ?></code><!--
+						--><input name="blog[domain]" type="text" class="regular-text code" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required />
+					<?php endif; ?>
 				</span>
-				<?php
-			} else {
-				echo '<span class="code">';
-				echo '<code class="no-break">' . get_network()->domain . get_network()->path . '</code>';
-				?>
-				<input name="blog[domain]" type="text" class="regular-text code" id="site-address" aria-describedby="site-address-desc" autocapitalize="none" autocorrect="off" required />
-				<?php
-				echo '</span>';
-			}
-			echo '<p class="description" id="site-address-desc">' . __( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ) . '</p>';
-			?>
+				<p class="description" id="site-address-desc">
+					<?php _e( 'Only lowercase letters (a-z), numbers, and hyphens are allowed.' ); ?>
+				</p>
 			</td>
 		</tr>
 		<tr class="form-field form-required">
