Changeset 16672

Timestamp:

12/01/2010 09:32:40 PM (14 years ago)

Author:

ryan

Message:

Network setup fixes. Props wpdavis. fixes #15620

File:

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

trunk/wp-admin/network.php

@@ -138 +138 @@
         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' );
+        include ( ABSPATH . 'wp-admin/admin-footer.php' );
         die();
     }
@@ -145 +145 @@
         echo '<div class="error"><p><strong>' . __('Error:') . '</strong> ' . __( 'The constant DO_NOT_UPGRADE_GLOBAL_TABLES cannot be defined when creating a network.' ) . '</p></div>';
         echo '</div>';
-        include ('./admin-footer.php' );
+        include ( ABSPATH . 'wp-admin/admin-footer.php' );
         die();
     }
@@ -153 +153 @@
         echo '<div class="updated"><p><strong>' . __('Warning:') . '</strong> ' . sprintf( __( 'Please <a href="%s">deactivate your plugins</a> before enabling the Network feature.' ), admin_url( 'plugins.php?plugin_status=active' ) ) . '</p></div><p>' . __( 'Once the network is created, you may reactivate your plugins.' ) . '</p>';
         echo '</div>';
-        include( './admin-footer.php' );
+        include( ABSPATH . 'wp-admin/admin-footer.php' );
         die();
     }
@@ -164 +164 @@
         echo '<a href="' . esc_url( admin_url() ) . '">' . __( 'Return to Dashboard' ) . '</a>';
         echo '</div>';
-        include( './admin-footer.php' );
+        include( ABSPATH . 'wp-admin/admin-footer.php' );
         die();
     }
@@ -512 +512 @@
 }
 
-$base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
-
 if ( $_POST ) {
+
+    $base = trailingslashit( stripslashes( dirname( dirname( $_SERVER['SCRIPT_NAME'] ) ) ) );
+
     check_admin_referer( 'install-network-1' );