Changeset 12674 for trunk/wp-includes/ms-settings.php

Timestamp:

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

Author:

wpmuguru

Message:

Add is_subdomain_install() to ms code - Fixes #11796

File:

• trunk/wp-includes/ms-settings.php (modified) (4 diffs)

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