Changeset 12674 for trunk/wp-includes/ms-functions.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-includes/ms-functions.php (modified) (7 diffs)

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 );