From 3ac0df51703cf9aa3008bee04c17b9851eec96fc Mon Sep 17 00:00:00 2001 From: ryan Date: Wed, 19 Sep 2007 04:27:56 +0000 Subject: [PATCH] Fix includes for setup-config so that wp_die is defined. Props DD32. fixes #4997 git-svn-id: http://svn.automattic.com/wordpress/trunk@6137 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/install.php | 1 + wp-admin/setup-config.php | 23 +++++++++++++++++------ wp-includes/functions.php | 8 +++++--- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/wp-admin/install.php b/wp-admin/install.php index 1f1069365..794c35214 100644 --- a/wp-admin/install.php +++ b/wp-admin/install.php @@ -1,6 +1,7 @@ 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.", "WordPress › Error"); } diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index 2c01b4e1f..566fd835d 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -1,19 +1,28 @@ The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); if (isset($_GET['step'])) $step = $_GET['step']; else $step = 0; -header( 'Content-Type: text/html; charset=utf-8' ); + +function display_header(){ + header( 'Content-Type: text/html; charset=utf-8' ); ?> @@ -76,12 +85,11 @@ header( 'Content-Type: text/html; charset=utf-8' );

WordPress

The file 'wp-config.php' already exists. If you need to reset any of the configuration items in this file, please delete it first. You may try installing now.

"); +}//end function display_header(); switch($step) { case 0: + display_header(); ?>

Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.

@@ -98,6 +106,7 @@ switch($step) { break; case 1: + display_header(); ?>

@@ -177,6 +186,8 @@ switch($step) { } fclose($handle); chmod('../wp-config.php', 0666); + + display_header(); ?>

All right sparky! You've made it through this part of the installation. WordPress can now communicate with your database. If you are ready, time now to run the install!