Ticket #7997: setup-config.diff

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'))
+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']))