Changeset 7971 for trunk/wp-blog-header.php

Timestamp:

05/21/2008 05:59:27 AM (17 years ago)

Author:

ryan

Message:

Allow wp-config.php to exist one level up from WordPress root directory. Props sambauers. fixes #6933

File:

• trunk/wp-blog-header.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -1 +1 @@
 <?php
 
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
-    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
-    else $path = 'wp-admin/';
+if ( !isset($wp_did_header) ) {
 
-    require_once( dirname(__FILE__) . '/wp-includes/classes.php');
-    require_once( dirname(__FILE__) . '/wp-includes/functions.php');
-    require_once( dirname(__FILE__) . '/wp-includes/plugin.php');
-    wp_die("There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>. You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.</p><p><a href='{$path}setup-config.php' class='button'>Create a Configuration File</a>", "WordPress &rsaquo; Error");
+    $wp_did_header = true;
+
+    require_once( dirname(__FILE__) . '/wp-load.php' );
+
+    wp();
+
+    require_once( ABSPATH . WPINC . '/template-loader.php' );
+
 }
 
-$wp_did_header = true;
-
-require_once( dirname(__FILE__) . '/wp-config.php');
-
-wp();
-
-require_once(ABSPATH . WPINC . '/template-loader.php');
-
-endif;
-
 ?>