Changeset 9443

Timestamp:

10/31/2008 07:24:45 PM (18 years ago)

Author:

ryan

Message:

Allow nested install. Props sivel. fixes #7997

Location:

trunk

Files:

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

trunk/wp-admin/setup-config.php

@@ -44 +44 @@
 
 // Check if wp-config.php exists above the root directory
-if (file_exists('../../wp-config.php'))
+if (file_exists('../../wp-config.php') && ! file_exists('../../wp-load.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' ) ) {
+} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-load.php' ) ) {
 
     /** The config file resides one level below ABSPATH */