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

git-svn-id: https://develop.svn.wordpress.org/trunk@10698 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2009-03-04 19:30:16 +00:00
parent ee2a7bf311
commit 13dc24e8e0
2 changed files with 4 additions and 4 deletions

View File

@@ -26,9 +26,9 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
/** The config file resides in ABSPATH */
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' );
} else {