Changeset 12674 for trunk/wp-admin/ms-sites.php

Timestamp:

01/08/2010 09:25:01 PM (17 years ago)

Author:

wpmuguru

Message:

Add is_subdomain_install() to ms code - Fixes #11796

File:

• trunk/wp-admin/ms-sites.php (modified) (3 diffs)

trunk/wp-admin/ms-sites.php

@@ -402 +402 @@
                 <?php
                 // define the columns to display, the syntax is 'internal name' => 'display name'
-                $blogname_columns = ( constant( "VHOST" ) == 'yes' ) ? __('Domain') : __('Path');
+                $blogname_columns = ( is_subdomain_install() ) ? __('Domain') : __('Path');
                 $posts_columns = array(
                         'id'           => __('ID'),
@@ -458 +458 @@
                                         echo "<tr $bgcolour class='$class'>";
 
-                                        $blogname = ( constant( "VHOST" ) == 'yes' ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path'];
+                                        $blogname = ( is_subdomain_install() ) ? str_replace('.'.$current_site->domain, '', $blog['domain']) : $blog['path'];
                                         foreach( $posts_columns as $column_name=>$column_display_name ) {
                                                 switch($column_name) {
@@ -587 +587 @@
                                                 <th style="text-align:center;" scope='row'><?php _e('Blog Address') ?></th>
                                                 <td>
-                                                <?php if ( constant( "VHOST" ) == 'yes' ) { ?>
+                                                <?php if ( is_subdomain_install() ) { ?>
                                                         <input name="blog[domain]" type="text" title="<?php _e('Domain') ?>"/>.<?php echo $current_site->domain;?>
                                                 <?php } else {