Wordpress 3.1.1-scripts

[autoinstalls/wordpress.git] / wp-blog-header.php

diff --git a/wp-blog-header.php b/wp-blog-header.php
index ff81b46c821566729b790944e7a73b605f6a183f..0f7118f3c1642b1692fe118176b475a1f68cd3f9 100644 (file)
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -1,24 +1,20 @@
 <?php
+/**
+ * Loads the WordPress environment and template.
+ *
+ * @package WordPress
+ */
 
-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;
+       $wp_did_header = true;
 
-require_once( dirname(__FILE__) . '/wp-config.php');
+       require_once( dirname(__FILE__) . '/wp-load.php' );
 
-wp();
+       wp();
 
-require_once(ABSPATH . WPINC . '/template-loader.php');
+       require_once( ABSPATH . WPINC . '/template-loader.php' );
 
-endif;
+}
 
-?>
+?>
\ No newline at end of file