Added check for wp-config.php and edited text and style slightly. Took out it saying we were done when we weren't.
git-svn-id: http://svn.automattic.com/wordpress/trunk@423 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
cc03c08a75
commit
aaefcd4c40
|
@ -1,14 +1,14 @@
|
||||||
<?php
|
<?php
|
||||||
$_wp_installing = 1;
|
$_wp_installing = 1;
|
||||||
|
if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config.sample.php with the proper database connection information and renamed it to wp-config.php.");
|
||||||
require_once('../wp-config.php');
|
require_once('../wp-config.php');
|
||||||
|
|
||||||
$step = $HTTP_GET_VARS['step'];
|
$step = $HTTP_GET_VARS['step'];
|
||||||
if (!$step) $step = 0;
|
if (!$step) $step = 0;
|
||||||
if (!step) $step = 0;
|
|
||||||
?>
|
?>
|
||||||
<!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">
|
||||||
<title>WordPress > b2 Conversion</title>
|
<title>WordPress — b2 Conversion</title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||||
<style media="screen" type="text/css">
|
<style media="screen" type="text/css">
|
||||||
body {
|
body {
|
||||||
|
@ -31,7 +31,7 @@ if (!step) $step = 0;
|
||||||
#logo a span {
|
#logo a span {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
p {
|
p, li {
|
||||||
line-height: 140%;
|
line-height: 140%;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
@ -47,7 +47,7 @@ switch($step) {
|
||||||
familiar to you. Here are some notes on upgrading:</p>
|
familiar to you. Here are some notes on upgrading:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li>If you're using an older version of b2, it's probably a good idea to upgrade
|
<li>If you're using an older version of b2, it's probably a good idea to upgrade
|
||||||
to at least .6.1 before making the leap to WordPress.</li>
|
to at least .61 before making the leap to WordPress.</li>
|
||||||
<li>The templates are so much better, and there is so much more going on than
|
<li>The templates are so much better, and there is so much more going on than
|
||||||
before it's probably worth it to start from scratch and work back to your
|
before it's probably worth it to start from scratch and work back to your
|
||||||
design.</li>
|
design.</li>
|
||||||
|
@ -59,7 +59,7 @@ switch($step) {
|
||||||
Right now.</li>
|
Right now.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If
|
<p><code></code>Have you looked at the <a href="../readme.html">readme</a>? If
|
||||||
you’re all ready, <a href="b2-2-wp.php?step=1">let's go</a>! </p>
|
you’re all ready, <a href="b2-2-wp.php?step=1">let’s go</a>!</p>
|
||||||
<?php
|
<?php
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -244,8 +244,6 @@ $q = $wpdb->query($query);
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<p>All done!</p>
|
|
||||||
|
|
||||||
<p>Don't forget to CHMOD the <code>weblogs.com.changes.cache</code> file and you'll
|
<p>Don't forget to CHMOD the <code>weblogs.com.changes.cache</code> file and you'll
|
||||||
be A-okay. Welcome to the family.</p>
|
be A-okay. Welcome to the family.</p>
|
||||||
<p>Now there is one more step to the upgrade process. <a href="upgrade-071-to-072.php">Continue upgrade</a></p>
|
<p>Now there is one more step to the upgrade process. <a href="upgrade-071-to-072.php">Continue upgrade</a></p>
|
||||||
|
@ -255,4 +253,4 @@ $q = $wpdb->query($query);
|
||||||
?>
|
?>
|
||||||
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
Loading…
Reference in New Issue