Changeset 3117

Timestamp:

07/04/2010 06:07:51 AM (16 years ago)

Author:

johnjamesjacoby

Message:

Fixes #2489 props wpmuguru

Location:

branches/1.2

Files:

• bp-blogs/bp-blogs-templatetags.php (modified) (2 diffs)
• bp-core/bp-core-catchuri.php (modified) (2 diffs)
• bp-core/bp-core-wpabstraction.php (modified) (1 diff)
• bp-themes/bp-default/registration/register.php (modified) (1 diff)

branches/1.2/bp-blogs/bp-blogs-templatetags.php

@@ -362 +362 @@
 
         // Blog name
-        if( 'no' == constant( "VHOST" ) )
+        if( !is_subdomain_install() )
                 echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>';
         else
@@ -371 +371 @@
         <?php }
 
-        if( 'no' == constant( "VHOST" ) ) {
+        if ( !is_subdomain_install() )
                 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />';
-        } else {
+        else
                 echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />';
-        }
+
         if ( !is_user_logged_in() ) {
                 print '(<strong>' . __( 'Your address will be ' , 'buddypress');
-                if( 'no' == constant( "VHOST" ) ) {
+
+                if ( !is_subdomain_install() ) {
                         print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress');
                 } else {
                         print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path;
                 }
+
                 echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>';
         }

branches/1.2/bp-core/bp-core-catchuri.php

@@ -136 +136 @@
                 $is_root_component = in_array( $bp_uri[0], $bp->root_components );
 
-        if ( 'no' == VHOST && !$is_root_component ) {
+        if ( !is_subdomain_install() && !$is_root_component ) {
                 $component_index++;
                 $action_index++;
@@ -155 +155 @@
 
         /* Remove the username from action variables if this is not a VHOST install */
-        if ( 'no' == VHOST && !$is_root_component )
+        if ( !is_subdomain_install() && !$is_root_component )
                 array_shift($action_variables);
 

branches/1.2/bp-core/bp-core-wpabstraction.php

@@ -90 +90 @@
         }
 }
+
+if ( !function_exists( 'is_subdomain_install' ) ) {
+        function is_subdomain_install() {
+                if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) )
+                        return true;
+
+                return false;
+        }
+}

branches/1.2/bp-themes/bp-default/registration/register.php

@@ -181 +181 @@
                                                         <?php do_action( 'bp_signup_blog_url_errors' ) ?>
 
-                                                        <?php if ( 'yes' == VHOST ) : ?>
+                                                        <?php if ( is_subdomain_install() ) : ?>
                                                                 http:// <input type="text" name="signup_blog_url" id="signup_blog_url" value="<?php bp_signup_blog_url_value() ?>" /> .<?php echo str_replace( 'http://', '', site_url() ) ?>
                                                         <?php else : ?>