From 631c9bb4d60d242432052f56c00768392f42a392 Mon Sep 17 00:00:00 2001
From: donncha
Date: Tue, 24 Jun 2008 17:00:10 +0000
Subject: WP Merge to revision 8180
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1336 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
wp-load.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'wp-load.php')
diff --git a/wp-load.php b/wp-load.php
index f912ed6..423edf5 100644
--- a/wp-load.php
+++ b/wp-load.php
@@ -9,9 +9,9 @@
* will be displayed asking the visitor to set up the
* wp-config.php file.
*
- * Also made to work in the wp-admin/ folder, because it
- * will look in the parent directory if the file is not
- * found in the current directory.
+ * Will also search for wp-config.php in WordPress' parent
+ * directory to allow the WordPress directory to remain
+ * untouched.
*
* @package WordPress
*/
@@ -43,7 +43,7 @@ if ( file_exists( ABSPATH . 'wp-config.php') ) {
require_once( ABSPATH . '/wp-includes/classes.php' );
require_once( ABSPATH . '/wp-includes/functions.php' );
require_once( ABSPATH . '/wp-includes/plugin.php' );
- wp_die("There doesn't seem to be a wp-config.php
file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php
file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.
Create a Configuration File", "WordPress › Error");
+ wp_die(sprintf(/*WP_I18N_NO_CONFIG*/"There doesn't seem to be a wp-config.php
file. I need this before we can get started. Need more help? We got it. You can create a wp-config.php
file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file.
Create a Configuration File"/*/WP_I18N_NO_CONFIG*/, $path), /*WP_I18N_ERROR_TITLE*/"WordPress › Error"/*/WP_I18N_ERROR_TITLE*/);
}
--
cgit