Ticket #29688: 29688.2.diff

wp-config-sample.php

@@ -79 +79 @@
  */
 define('WP_DEBUG', false);
 
-/* That's all, stop editing! Happy blogging. */
+/*
+ * That's all, stop editing! Happy blogging.
+ *
+ * NOTHING PLACED BELOW THIS LINE WILL HAVE AN EFFECT ON YOUR SITE.
+ *
+ */
 
 /** Absolute path to the WordPress directory. */
 if ( !defined('ABSPATH') )

wp-load.php

@@ -23 +23 @@
 
 error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
 
+$_wp_config_file = '';
 /*
  * If wp-config.php exists in the WordPress root, or if it exists in the root and wp-settings.php
  * doesn't, load wp-config.php. The secondary check for wp-settings.php has the added benefit
@@ -33 +34 @@
  */
 if ( file_exists( ABSPATH . 'wp-config.php') ) {
 
-        /** The config file resides in ABSPATH */
-        require_once( ABSPATH . 'wp-config.php' );
+    /** The config file resides in ABSPATH */
+    $_wp_config_file = ABSPATH . 'wp-config.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' );
+    /** The config file resides one level above ABSPATH but is not part of another install */
+    $_wp_config_file = dirname( ABSPATH ) . '/wp-config.php';
+
+}
+
+if ( '' !== $_wp_config_file ) {
+
+    require_once( $_wp_config_file );
+
+    /**
+     * Prove we're loaded correctly.
+     */
+    if ( ! isset( $wp_did_header ) ) {
+        require_once( ABSPATH . WPINC . '/functions.php' );
+        _doing_it_wrong( 'wp-load.php', __( 'Do not load wp-load.php directly.' ) ); // @todo: insert WordPress version number
+    }
 
 } else {
 

wp-settings.php

@@ -102 +102 @@
 require( ABSPATH . WPINC . '/pomo/mo.php' );
 require( ABSPATH . WPINC . '/class-phpass.php' );
 
+/**
+ * Prove we're loaded correctly. Executed soon-after functions.php is loaded, which is the earliest we can run _doing_it_wrong().
+ */
+if ( ! isset( $wp_did_header ) ) {
+    _doing_it_wrong( 'wp-settings.php', __( 'Do not load wp-settings.php or wp-config.php directly.' ) ); // @todo: insert WordPress version number
+}
+
 // Include the wpdb class and, if present, a db.php database drop-in.
 global $wpdb;
 require_wp_db();