Changeset 4438

Timestamp:

05/29/2011 11:22:47 AM (14 years ago)

Author:

djpaul

Message:

Correct domain when user creates a new site through bp-blogs, in a subdomain setup. Fixes #1796

File:

• trunk/bp-blogs/bp-blogs-template.php (modified) (2 diffs)

trunk/bp-blogs/bp-blogs-template.php

@@ -482 +482 @@
 
 function bp_blogs_validate_blog_signup() {
-    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path;
+    global $wpdb, $current_user, $blogname, $blog_title, $errors, $domain, $path, $current_site;
 
     if ( !check_admin_referer( 'bp_blog_signup_form' ) )
@@ -506 +506 @@
     $meta = apply_filters( 'add_signup_meta', $meta );
 
-    /* If this is a VHOST install, remove the username from the domain as we are setting this blog
-       up inside a user domain, not the root domain. */
+    // If this is a subdomain install, set up the site inside the root domain.
+    if ( is_subdomain_install() )
+        $domain = $blogname . '.' . preg_replace( '|^www\.|', '', $current_site->domain );
 
     wpmu_create_blog( $domain, $path, $blog_title, $current_user->id, $meta, $wpdb->siteid );