diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-12 16:21:15 +0000 |
commit | 3a4570b0fc8b3d6339bef71d17d7701554e0bbf7 (patch) | |
tree | 2a06e5261263c68d8afd95a6328879dc289cb909 /index-install.php | |
parent | b83c34a7010faee0223f6037025c350da12e05e6 (diff) | |
download | wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.gz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.tar.xz wordpress-mu-3a4570b0fc8b3d6339bef71d17d7701554e0bbf7.zip |
Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1069 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'index-install.php')
-rw-r--r-- | index-install.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/index-install.php b/index-install.php index 0c85b36..d36f67a 100644 --- a/index-install.php +++ b/index-install.php @@ -409,7 +409,7 @@ We hope you enjoy your new weblog. wp_mail( $email, "Your new WordPress MU site is ready!", $msg, "From: wordpress@" . $_SERVER[ 'HTTP_HOST' ] ); ?><h2>Installation Finished!</h2> <p>Congratulations! Your <a href='http://<?php echo $domain . $base; ?>'>WordPress µ site</a> has been configured.</p> - <p>You can <a href='wp-login.php'>log in</a> using the username "admin" and password "<?php echo $pass; ?>"</p> + <p>You can <a href='wp-login.php'>log in</a> using the username "admin" and password <?php echo $pass; ?></p> <h3>Directory Permissions</h3> <p>Please remember to reset the permissions on the following directories:<ul> <?php @@ -469,7 +469,7 @@ switch($action) { step2(); // Install Blog! include_once('./wp-config.php'); - include_once('./wp-admin/upgrade-functions.php'); + include_once('./wp-admin/includes/upgrade.php'); // normalise hostname - no www. $_SERVER[ 'HTTP_HOST' ] = str_replace( 'www.', '', $_SERVER[ 'HTTP_HOST' ] ); make_db_current_silent(); |