Changeset 10698

Timestamp:

03/04/2009 07:30:16 PM (17 years ago)

Author:

ryan

Message:

Nested install fixes. Props sivel. fixes #7997 for trunk

Location:

trunk

Files:

• wp-admin/setup-config.php (modified) (1 diff)
• wp-load.php (modified) (1 diff)

trunk/wp-admin/setup-config.php

@@ -43 +43 @@
     wp_die("<p>The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
 
-// Check if wp-config.php exists above the root directory
-if (file_exists('../../wp-config.php') && ! file_exists('../../wp-load.php'))
+// Check if wp-config.php exists above the root directory but is not part of another install
+if (file_exists('../../wp-config.php') && ! file_exists('../../wp-settings.php'))
     wp_die("<p>The file 'wp-config.php' already exists one level above your WordPress installation. If you need to reset any of the configuration items in this file, please delete it first. You may try <a href='install.php'>installing now</a>.</p>");
 

trunk/wp-load.php

@@ -27 +27 @@
     require_once( ABSPATH . 'wp-config.php' );
 
-} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-load.php' ) ) {
+} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) {
 
-    /** The config file resides one level below ABSPATH */
+    /** The config file resides one level above ABSPATH but is not part of another install*/
     require_once( dirname(ABSPATH) . '/wp-config.php' );