Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow nested install. Props sivel. fixes #7997 

git-svn-id: http://svn.automattic.com/wordpress/trunk@9443 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2008-10-31 19:24:45 +00:00
parent 0e169da4dc
commit f8090206fa
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/setup-config.php
View File

@ -43,7 +43,7 @@ if (file_exists('../wp-config.php'))
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'))
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>");
if (isset($_GET['step']))

2
wp-load.php
View File

@ -26,7 +26,7 @@ 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' ) ) {
} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-load.php' ) ) {
/** The config file resides one level below ABSPATH */
require_once( dirname(ABSPATH) . '/wp-config.php' );