Changeset 14884

Timestamp:

05/25/2010 03:16:31 PM (16 years ago)

Author:

nacin

Message:

Improved mayday calls in network.php when a subdirectory install isn't allowed. Also, /allow_folder_install/allow_subdirectory_install/g. fixes #12884, fixes #12931.

File:

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

trunk/wp-admin/network.php

@@ -51 +51 @@
 }
 /**
- * Allow folder install
- *
- * @since 3.0.0
- * @return bool Whether folder install is allowed
- */
-function allow_folder_install() {
+ * Allow subdirectory install
+ *
+ * @since 3.0.0
+ * @return bool Whether subdirectory install is allowed
+ */
+function allow_subdirectory_install() {
         global $wpdb;
-        if ( apply_filters( 'allow_folder_install', false ) )
+        if ( apply_filters( 'allow_subdirectory_install', false ) )
                 return true;
 
@@ -162 +162 @@
         } elseif ( apache_mod_loaded('mod_rewrite') ) { // assume nothing
                 $subdomain_install = true;
-        } elseif ( !allow_folder_install() ) {
+        } elseif ( !allow_subdirectory_install() ) {
                 $subdomain_install = true;
         } else {
@@ -173 +173 @@
         }
 
-        if ( allow_subdomain_install() && allow_folder_install() ) : ?>
+        if ( allow_subdomain_install() && allow_subdirectory_install() ) : ?>
                 <h3><?php esc_html_e( 'Addresses of Sites in your Network' ); ?></h3>
                 <p><?php _e( 'Please choose whether you would like sites in your WordPress network to use sub-domains or sub-directories. <strong>You cannot change this later.</strong>' ); ?></p>
@@ -212 +212 @@
                         <tr>
                                 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
-                                <td><?php _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' ); ?></td>
+                                <td><?php
+                                        _e( 'Because you are using <code>localhost</code>, the sites in your WordPress network must use sub-directories. Consider using <code>localhost.localdomain</code> if you wish to use sub-domains.' );
+                                        // Uh oh:
+                                        if ( !allow_subdirectory_install() )
+                                                echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                                ?></td>
                         </tr>
                 <?php elseif ( !allow_subdomain_install() ) : ?>
                         <tr>
                                 <th scope="row"><?php esc_html_e( 'Sub-directory Install' ); ?></th>
-                                <td><?php _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' ); ?></td>
-                        </tr>
-                <?php elseif ( !allow_folder_install() ) : ?>
+                                <td><?php
+                                        _e( 'Because your install is in a directory, the sites in your WordPress network must use sub-directories.' );
+                                        // Uh oh:
+                                        if ( !allow_subdirectory_install() )
+                                                echo ' <strong>' . __( 'Warning!' ) . ' ' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';       
+                                ?></td>
+                        </tr>
+                <?php elseif ( !allow_subdirectory_install() ) : ?>
                         <tr>
                                 <th scope="row"><?php esc_html_e( 'Sub-domain Install' ); ?></th>
-                                <td><?php _e( 'Because your install is over 1 month old, the sites in your WordPress network must use sub-domains.' ); ?></td>
+                                <td><?php _e( 'Because your install is not new, the sites in your WordPress network must use sub-domains.' );
+                                        echo ' <strong>' . __( 'The main site in a sub-directory install will need to use a modified permalink structure, potentially breaking existing links.' ) . '</strong>';
+                                ?></td>
                         </tr>
                 <?php endif; ?>
@@ -267 +279 @@
 
         if ( $_POST ) {
-                $subdomain_install = allow_subdomain_install() ? ( allow_folder_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
+                $subdomain_install = allow_subdomain_install() ? ( allow_subdirectory_install() ? ! empty( $_POST['subdomain_install'] ) : true ) : false;
         } else {
                 if ( is_multisite() ) {