Changeset 34867

Timestamp:

10/06/2015 02:19:17 PM (9 years ago)

Author:

wonderboymusic

Message:

Setup/Config: some dirname( ABSPATH ) file lookups should have errors suppressed due to possibility of open_basedir restrictions on hosts.

Props chriscct7, misterunknown.
Fixes #29680.

Location:

trunk/src

Files:

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

trunk/src/wp-admin/setup-config.php

@@ -54 +54 @@
 
 // Check if wp-config.php exists above the root directory but is not part of another install
-if ( file_exists(ABSPATH . '../wp-config.php' ) && ! file_exists( ABSPATH . '../wp-settings.php' ) )
+if ( @file_exists( ABSPATH . '../wp-config.php' ) && ! @file_exists( ABSPATH . '../wp-settings.php' ) ) {
     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>' );
+}
 
 $step = isset( $_GET['step'] ) ? (int) $_GET['step'] : -1;

trunk/src/wp-load.php

@@ -37 +37 @@
     require_once( ABSPATH . 'wp-config.php' );
 
-} elseif ( file_exists( dirname(ABSPATH) . '/wp-config.php' ) && ! file_exists( dirname(ABSPATH) . '/wp-settings.php' ) ) {
+} elseif ( @file_exists( dirname( ABSPATH ) . '/wp-config.php' ) && ! @file_exists( dirname( ABSPATH ) . '/wp-settings.php' ) ) {
 
     /** The config file resides one level above ABSPATH but is not part of another install */
-    require_once( dirname(ABSPATH) . '/wp-config.php' );
+    require_once( dirname( ABSPATH ) . '/wp-config.php' );
 
 } else {