Changeset 3117
- Timestamp:
- 07/04/2010 06:07:51 AM (15 years ago)
- Location:
- branches/1.2
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/1.2/bp-blogs/bp-blogs-templatetags.php
r2975 r3117 362 362 363 363 // Blog name 364 if( 'no' == constant( "VHOST") )364 if( !is_subdomain_install() ) 365 365 echo '<label for="blogname">' . __('Blog Name:', 'buddypress') . '</label>'; 366 366 else … … 371 371 <?php } 372 372 373 if ( 'no' == constant( "VHOST" ) ) {373 if ( !is_subdomain_install() ) 374 374 echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span> <input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /><br />'; 375 } else {375 else 376 376 echo '<input name="blogname" type="text" id="blogname" value="'.$blogname.'" maxlength="50" /> <span class="suffix_address">.' . $current_site->domain . $current_site->path . '</span><br />'; 377 } 377 378 378 if ( !is_user_logged_in() ) { 379 379 print '(<strong>' . __( 'Your address will be ' , 'buddypress'); 380 if( 'no' == constant( "VHOST" ) ) { 380 381 if ( !is_subdomain_install() ) { 381 382 print $current_site->domain . $current_site->path . __( 'blogname' , 'buddypress'); 382 383 } else { 383 384 print __( 'domain.' , 'buddypress') . $current_site->domain . $current_site->path; 384 385 } 386 385 387 echo '.</strong> ' . __( 'Must be at least 4 characters, letters and numbers only. It cannot be changed so choose carefully!)' , 'buddypress') . '</p>'; 386 388 } -
branches/1.2/bp-core/bp-core-catchuri.php
r3114 r3117 136 136 $is_root_component = in_array( $bp_uri[0], $bp->root_components ); 137 137 138 if ( 'no' == VHOST&& !$is_root_component ) {138 if ( !is_subdomain_install() && !$is_root_component ) { 139 139 $component_index++; 140 140 $action_index++; … … 155 155 156 156 /* Remove the username from action variables if this is not a VHOST install */ 157 if ( 'no' == VHOST&& !$is_root_component )157 if ( !is_subdomain_install() && !$is_root_component ) 158 158 array_shift($action_variables); 159 159 -
branches/1.2/bp-core/bp-core-wpabstraction.php
r2923 r3117 90 90 } 91 91 } 92 93 if ( !function_exists( 'is_subdomain_install' ) ) { 94 function is_subdomain_install() { 95 if ( ( defined( 'VHOST' ) && 'yes' == VHOST ) || ( defined( 'SUBDOMAIN_INSTALL' ) && SUBDOMAIN_INSTALL ) ) 96 return true; 97 98 return false; 99 } 100 } -
branches/1.2/bp-themes/bp-default/registration/register.php
r2963 r3117 181 181 <?php do_action( 'bp_signup_blog_url_errors' ) ?> 182 182 183 <?php if ( 'yes' == VHOST) : ?>183 <?php if ( is_subdomain_install() ) : ?> 184 184 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() ) ?> 185 185 <?php else : ?>
Note: See TracChangeset
for help on using the changeset viewer.