Changeset 12674

Timestamp:

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

Author:

wpmuguru

Message:

Add is_subdomain_install() to ms code - Fixes #11796

Location:

trunk

Files:

• wp-admin/includes/ms.php (modified) (1 diff)
• wp-admin/ms-edit.php (modified) (2 diffs)
• wp-admin/ms-options.php (modified) (1 diff)
• wp-admin/ms-sites.php (modified) (3 diffs)
• wp-config-sample.php (modified) (1 prop)
• wp-includes/ms-functions.php (modified) (7 diffs)
• wp-includes/ms-settings.php (modified) (4 diffs)
• wp-signup.php (modified) (4 diffs)

trunk/wp-admin/includes/ms.php

@@ -733 +733 @@
 
 function avoid_blog_page_permalink_collision( $data, $postarr ) {
-    if( constant( 'VHOST' ) == 'yes' )
+    if( is_subdomain_install() )
         return $data;
     if( $data[ 'post_type' ] != 'page' )

trunk/wp-admin/ms-edit.php

@@ -71 +71 @@
                 if ( is_numeric( $dashboard_blog ) )
                     wp_die( __( 'Dashboard blog_id must be a blog that already exists' ) );
-                if ( constant( 'VHOST' ) == 'yes' ) {
+                if ( is_subdomain_install() ) {
                     $domain = $dashboard_blog . '.' . $current_site->domain;
                     $path = $current_site->path;
@@ -146 +146 @@
             wp_die( __('Invalid email address') );
 
-        if( constant( 'VHOST' ) == 'yes' ) {
+        if( is_subdomain_install() ) {
             $newdomain = $domain.".".$current_site->domain;
             $path = $base;

trunk/wp-admin/ms-options.php

@@ -56 +56 @@
                     <label><input name="registration" type="radio" id="registration4" value='blog' <?php echo get_site_option('registration') == 'blog' ? 'checked="checked"' : ''; ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br />
                     <p><?php _e('Disable or enable registration and who or what can be registered. (Default=all)'); ?></p>
-                    <?php if( constant( 'VHOST' ) == 'yes' ) {
+                    <?php if( is_subdomain_install() ) {
                         echo "<p>" . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant blog.') . "</p>";
                     } ?>

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 {

trunk/wp-includes/ms-functions.php

@@ -32 +32 @@
     global $current_site;
 
-    if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) {
+    if( is_subdomain_install() ) {
         if( $blogname == 'main' )
             $blogname = 'www';
@@ -42 +42 @@
 
 function get_blogaddress_by_domain( $domain, $path ){
-    if( defined( "VHOST" ) && constant( "VHOST" ) == 'yes' ) {
+    if( is_subdomain_install() ) {
         $url = "http://".$domain.$path;
     } else {
@@ -109 +109 @@
         return $blog_id;
 
-    if ( defined('VHOST') && constant( 'VHOST' ) == 'yes' ) {
+    if ( is_subdomain_install() ) {
         $domain = $name . '.' . $current_site->domain;
         $path = $current_site->path;
@@ -1034 +1034 @@
 
     // do not allow users to create a blog that conflicts with a page on the main blog.
-    if ( constant( "VHOST" ) == 'no' && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+    if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
         $errors->add( 'blogname', __( "Sorry, you may not use that blog name" ) );
     }
@@ -1052 +1052 @@
 
     // Check if the domain/path has been used already.
-    if( constant( "VHOST" ) == 'yes' ) {
+    if( is_subdomain_install() ) {
         $mydomain = "$blogname.$domain";
         $path = $base;
@@ -1139 +1139 @@
 
     // Send email with activation link.
-    if( constant( "VHOST" ) == 'no' || $current_site->id != 1 ) {
+    if( !is_subdomain_install() || $current_site->id != 1 ) {
         $activate_url = "http://" . $current_site->domain . $current_site->path . "wp-activate.php?key=$key";
     } else {
@@ -1268 +1268 @@
 function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id = 1) {
     $domain = preg_replace( "/\s+/", '', sanitize_user( $domain, true ) );
-    if( constant( 'VHOST' ) == 'yes' )
+    if( is_subdomain_install() )
         $domain = str_replace( '@', '', $domain );
     $title = strip_tags( $title );

trunk/wp-includes/ms-settings.php

@@ -1 +1 @@
 <?php
+
+/**
+ * Whether a subdomain configuration is enabled
+ *
+ * @since 3.0
+ *
+ * @return bool True if subdomain configuration is enabled, false otherwise.
+ */
+function is_subdomain_install() {
+    if ( defined('VHOST') && VHOST == 'yes' )
+        return true;
+
+    return false;
+}
+
 if( isset( $current_site ) && isset( $current_blog ) )
     return;
@@ -66 +81 @@
     }
     $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
-    if( constant( 'VHOST' ) == 'yes' ) {
+    if( is_subdomain_install() ) {
         $current_site = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->site WHERE domain = %s AND path = %s", $domain, $path) );
         if( $current_site != null )
@@ -114 +129 @@
     $current_site->blog_id = $wpdb->get_var( "SELECT blog_id FROM {$wpdb->blogs} WHERE domain='{$current_site->domain}' AND path='{$current_site->path}'" );
 
-if( constant( 'VHOST' ) == 'yes' ) {
+if( is_subdomain_install() ) {
     $current_blog = wp_cache_get( 'current_blog_' . $domain, 'site-options' );
     if( !$current_blog ) {
@@ -144 +159 @@
 }
 
-if( defined( "WP_INSTALLING" ) == false && constant( 'VHOST' ) == 'yes' && !is_object( $current_blog ) ) {
+if( defined( "WP_INSTALLING" ) == false && is_subdomain_install() && !is_object( $current_blog ) ) {
     if( defined( 'NOBLOGREDIRECT' ) ) {
         $destination = constant( 'NOBLOGREDIRECT' );

trunk/wp-signup.php

@@ -57 +57 @@
     global $current_site;
     // Blog name
-    if( constant( "VHOST" ) == 'no' )
+    if( !is_subdomain_install() )
         echo '<label for="blogname">' . __('Blog Name:') . '</label>';
     else
@@ -66 +66 @@
     <?php }
 
-    if( constant( "VHOST" ) == 'no' ) {
+    if( !is_subdomain_install() ) {
         echo '<span class="prefix_address">' . $current_site->domain . $current_site->path . '</span><input name="blogname" type="text" id="blogname" value="'. esc_attr($blogname) .'" maxlength="50" /><br />';
     } else {
@@ -73 +73 @@
     if ( !is_user_logged_in() ) {
         print '(<strong>' . __( 'Your address will be ' );
-        if( constant( "VHOST" ) == 'no' ) {
+        if( !is_subdomain_install() ) {
             print $current_site->domain . $current_site->path . __( 'blogname' );
         } else {
@@ -421 +421 @@
             }
             if ($newblogname) {
-                if( constant( "VHOST" ) == 'no' )
+                if( !is_subdomain_install() )
                     $newblog = 'http://' . $current_site->domain . $current_site->path . $newblogname . '/';
                 else