setup-config fix from David House. fixes #2544
git-svn-id: http://svn.automattic.com/wordpress/trunk@3643 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
898d025430
commit
4b7d1d077d
|
@ -13,7 +13,8 @@ if (!is_writable('../')) die("Sorry, I can't write to the directory. You'll have
|
||||||
$step = 0;
|
$step = 0;
|
||||||
if(isset($_GET['step'])) $step = $_GET['step'];
|
if(isset($_GET['step'])) $step = $_GET['step'];
|
||||||
header( 'Content-Type: text/html; charset=utf-8' );
|
header( 'Content-Type: text/html; charset=utf-8' );
|
||||||
?>
|
|
||||||
|
function setup_header() { ?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||||
<head>
|
<head>
|
||||||
|
@ -50,10 +51,13 @@ header( 'Content-Type: text/html; charset=utf-8' );
|
||||||
<body>
|
<body>
|
||||||
<h1 id="logo"><a href="http://wordpress.org/"><span>WordPress</span></a></h1>
|
<h1 id="logo"><a href="http://wordpress.org/"><span>WordPress</span></a></h1>
|
||||||
<?php
|
<?php
|
||||||
|
}
|
||||||
|
|
||||||
switch($step) {
|
switch($step) {
|
||||||
case 0:
|
case 0:
|
||||||
|
setup_header();
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
<p>Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.</p>
|
||||||
<ol>
|
<ol>
|
||||||
<li>Database name</li>
|
<li>Database name</li>
|
||||||
|
@ -68,6 +72,7 @@ switch($step) {
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 1:
|
case 1:
|
||||||
|
setup_header();
|
||||||
?>
|
?>
|
||||||
</p>
|
</p>
|
||||||
<form method="post" action="setup-config.php?step=2">
|
<form method="post" action="setup-config.php?step=2">
|
||||||
|
@ -145,6 +150,7 @@ switch($step) {
|
||||||
}
|
}
|
||||||
fclose($handle);
|
fclose($handle);
|
||||||
chmod('../wp-config.php', 0666);
|
chmod('../wp-config.php', 0666);
|
||||||
|
setup_header();
|
||||||
?>
|
?>
|
||||||
<p>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 <a href="install.php">run the install!</a></p>
|
<p>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 <a href="install.php">run the install!</a></p>
|
||||||
<?php
|
<?php
|
||||||
|
|
Loading…
Reference in New Issue