summaryrefslogtreecommitdiffstats
path: root/index-install.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-04 16:44:15 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-04-04 16:44:15 +0000
commit7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc (patch)
treec6fd23b598f3994eddb18cb1c0f2e8d95ff054fa /index-install.php
parentf650f48c048bfbbb2ae702b6425d87e39358d748 (diff)
downloadwordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.gz
wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.xz
wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.zip
Merged with WordPress 2.5, unstable, only for testing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'index-install.php')
-rw-r--r--index-install.php16
1 files changed, 4 insertions, 12 deletions
diff --git a/index-install.php b/index-install.php
index 5d85b18..81e520e 100644
--- a/index-install.php
+++ b/index-install.php
@@ -337,6 +337,10 @@ function step2() {
case '$base = \'BASE\';':
fwrite($handle, str_replace('BASE', $base, $line));
break;
+ case "define('SECRET_K":
+ case "define('SECRET_S":
+ fwrite($handle, str_replace('put your unique phrase here', md5( mt_rand() ) . md5( mt_rand() ), $line));
+ break;
default:
fwrite($handle, $line);
break;
@@ -481,18 +485,6 @@ switch($action) {
do_htaccess( 'htaccess.dist', '.htaccess', $base, '');
step3();
break;
- case "step3":
- // call createBlog();
- // create .htaccess
- // print login info and links.
- require_once('./wp-config.php');
- require_once('./wp-admin/upgrade-functions.php');
- make_db_current_silent();
- populate_options();
- do_htaccess( 'htaccess.dist', '.htaccess', $base, '');
- printheader();
- step3();
- break;
default:
// check that directories are writeable.
// create wpmu-settings.php