Ticket #29680: 29680.patch
File 29680.patch, 1.8 KB (added by , 9 years ago) |
---|
-
src/wp-admin/setup-config.php
53 53 wp_die( '<p>' . sprintf( __( "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='%s'>installing now</a>." ), 'install.php' ) . '</p>' ); 54 54 55 55 // Check if wp-config.php exists above the root directory but is not part of another install 56 if ( file_exists(ABSPATH . '../wp-config.php' ) && !file_exists( ABSPATH . '../wp-settings.php' ) )56 if ( @file_exists(ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) 57 57 wp_die( '<p>' . sprintf( __( "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>."), 'install.php' ) . '</p>' ); 58 58 59 59 $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1; -
src/wp-load.php
36 36 /** The config file resides in ABSPATH */ 37 37 require_once( ABSPATH . 'wp-config.php' ); 38 38 39 } elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && !file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) {39 } elseif ( @file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! @file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) { 40 40 41 41 /** The config file resides one level above ABSPATH but is not part of another install */ 42 42 require_once( dirname(ABSPATH) . '/wp-config.php' );