Changeset 14659

Timestamp:

05/15/2010 06:49:16 AM (14 years ago)

Author:

nacin

Message:

Validation for network.php. props dremeda, see #13383.

File:

• trunk/wp-admin/network.php (modified) (6 diffs)

trunk/wp-admin/network.php

@@ -97 +97 @@
 <h2><?php echo esc_html( $title ); ?></h2>
 
-<form method="post" action="">
 <?php
 /**
@@ -110 +109 @@
 
     if ( get_option( 'siteurl' ) != get_option( 'home' ) ) {
-        echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</strong></p></div>';
+        echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . sprintf( __( 'Your <strong>WordPress address</strong> must match your <strong>Site address</strong> before creating a Network. See <a href="%s">General Settings</a>.' ), esc_url( admin_url( 'options-general.php' ) ) ) . '</p></div>';
         echo '</div>';
         include ('./admin-footer.php' );
@@ -127 +126 @@
     $has_ports = strstr( $hostname, ':' );
     if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
-        echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</strong></p></div>';
+        echo '<div class="error"><p><strong>' . __( 'Error:') . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
         echo '<p>' . sprintf( __( 'You cannot use port numbers such as <code>%s</code>.' ), $has_ports ) . '</p>';
         echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
@@ -134 +133 @@
         die();
     }
+
+    echo '<form method="post" action="">';
 
     wp_nonce_field( 'install-network-1' );
@@ -245 +246 @@
         </table>
         <p class='submit'><input class="button-primary" name='submit' type='submit' value='<?php esc_attr_e( 'Install' ); ?>' /></p>
+    </form>
         <?php
 }
@@ -391 +393 @@
 }
 ?>
-</form>
 </div>