diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-18 16:06:34 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-18 16:06:34 +0000 |
commit | 3261403f782b852ac84790eb47a5e4756aaf0136 (patch) | |
tree | 26f4da93bbab4616ecc4130b4380f3fa406a8902 /index-install.php | |
parent | c85bc5d149158ca9c4591f67d6744566b6367974 (diff) | |
download | wordpress-mu-3261403f782b852ac84790eb47a5e4756aaf0136.tar.gz wordpress-mu-3261403f782b852ac84790eb47a5e4756aaf0136.tar.xz wordpress-mu-3261403f782b852ac84790eb47a5e4756aaf0136.zip |
Don't use /blog/ for main blog if using not using VHOSTs
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1104 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'index-install.php')
-rw-r--r-- | index-install.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/index-install.php b/index-install.php index 270835d..26bd490 100644 --- a/index-install.php +++ b/index-install.php @@ -388,8 +388,8 @@ You can log in to the administrator account with the following information: Password: PASSWORD Login Here: BLOG_URLwp-login.php -We hope you enjoy your new weblog. - Thanks! +We hope you enjoy your new blog. +Thanks! --The Team @ SITE_NAME')" ); $wpdb->query( "INSERT INTO ".$wpdb->sitemeta." (meta_id, site_id, meta_key, meta_value) VALUES (NULL, 1, 'first_post', 'Welcome to <a href=\"SITE_URL\">SITE_NAME</a>. This is your first post. Edit or delete it, then start blogging!' )" ); @@ -404,7 +404,11 @@ We hope you enjoy your new weblog. wpmu_create_blog( $domain, $base, $weblog_title, $user_id, array() ); update_blog_option( 1, 'template', 'home'); update_blog_option( 1, 'stylesheet', 'home'); - update_blog_option( 1, 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/'); + if( constant( 'VHOST' ) == 'yes' ) { + update_blog_option( 1, 'permalink_structure', '/%year%/%monthnum%/%day%/%postname%/'); + } else { + update_blog_option( 1, 'permalink_structure', '/blog/%year%/%monthnum%/%day%/%postname%/'); + } update_blog_option( 1, 'rewrite_rules', ''); $msg = "Your new WordPress MU site has been created at\nhttp://{$domain}{$base}\n\nLogin details:\nUsername: admin\nPassword: $pass\nLogin: http://{$domain}{$base}wp-login.php\n"; wp_mail( $email, "Your new WordPress MU site is ready!", $msg, "From: wordpress@" . $_SERVER[ 'HTTP_HOST' ] ); |