Wordpress 2.5.1

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

diff --git a/wp-blog-header.php b/wp-blog-header.php
index c087324fc1c08218e72445310cd317f3e89f5aed..ff81b46c821566729b790944e7a73b605f6a183f 100644 (file)
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -2,9 +2,13 @@
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
 
 if (! isset($wp_did_header)):
 if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {

-       if ( strstr( $_SERVER['PHP_SELF'], 'wp-admin') ) $path = '';
+       if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';

        else $path = 'wp-admin/';
        else $path = 'wp-admin/';

-    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://wordpress.org/docs/faq/#wp-config'>We got it</a>. You can <a href='{$path}setup-config.php'>create a <code>wp-config.php</code> file through a web interface</a>, but this doesn't work for all server setups. The safest way is to manually create the file.");
+
+       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;


@@ -12,10 +16,9 @@ $wp_did_header = true;
 require_once( dirname(__FILE__) . '/wp-config.php');
 
 wp();
 require_once( dirname(__FILE__) . '/wp-config.php');
 
 wp();

-gzip_compression();

 
 require_once(ABSPATH . WPINC . '/template-loader.php');
 
 endif;
 
 
 require_once(ABSPATH . WPINC . '/template-loader.php');
 
 endif;
 

-?>
\ No newline at end of file
+?>