From e9274e601b49af6a87b2c79d356910114bbdcfbc Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Sat, 24 Jun 2006 08:17:14 +0000
Subject: Lookup fixes

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@594 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wpmu-settings.php | 66 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 29 deletions(-)

(limited to 'wpmu-settings.php')

diff --git a/wpmu-settings.php b/wpmu-settings.php
index c349e36..fb8e7cb 100644
--- a/wpmu-settings.php
+++ b/wpmu-settings.php
@@ -23,13 +23,21 @@ $wpdb->hide_errors();
 if( isset( $current_site ) == false ) {
 	$path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
 	if( constant( 'VHOST' ) == 'yes' ) {
-		$sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
-		$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$sitedomain' AND path='$path'" );
+		$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$domain' AND path='$path'" );
 		if( $current_site == null ) {
-			$path = '/';
-			$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$sitedomain' AND path='$path'" );
-			if( $current_site == null && defined( "WP_INSTALLING" ) == false )
-				die( "No WPMU site defined on this host." );
+			$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$domain' AND path='/'" );
+			if( $current_site == null ) {
+				$sitedomain = substr( $domain, 1 + strpos( $domain, '.' ) );
+				$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$sitedomain' AND path='$path'" );
+				if( $current_site == null ) {
+					$path = '/';
+					$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$sitedomain' AND path='$path'" );
+					if( $current_site == null && defined( "WP_INSTALLING" ) == false )
+						die( "No WPMU site defined on this host." );
+				}
+			} else {
+				$path = '/';
+			}
 		}
 	} else {
 		$current_site = $wpdb->get_row( "SELECT * FROM $wpdb->site WHERE domain = '$domain' AND path='$path'" );
@@ -43,37 +51,37 @@ if( isset( $current_site ) == false ) {
 }
 
 
-// Get site and blog details
-if( defined( "WP_INSTALLING" ) == false ) {
-	if( constant( 'VHOST' ) == 'yes' ) {
-		$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain'");
-		if( $current_blog != null )
-			$current_site = $wpdb->get_row("SELECT * FROM $wpdb->site WHERE id='{$current_blog->site_id}'");
+if( constant( 'VHOST' ) == 'yes' ) {
+	$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain'");
+	if( $current_blog != null )
+		$current_site = $wpdb->get_row("SELECT * FROM $wpdb->site WHERE id='{$current_blog->site_id}'");
+} else {
+	$blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
+	if( strpos( $blogname, '/' ) )
+		$blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
+	if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' ) {
+		$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");
 	} else {
-		$blogname = htmlspecialchars( substr( $_SERVER[ 'REQUEST_URI' ], strlen( $path ) ) );
-		if( strpos( $blogname, '/' ) )
-			$blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
-		if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' ) {
-			$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");
-		} else {
-			$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '{$path}{$blogname}/'");
-		}
+		$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '{$path}{$blogname}/'");
 	}
+}
 
+if( defined( "WP_INSTALLING" ) == false ) {
 	if( $current_blog == false || $current_site == false )
 		is_installed();
+}
 
-	$blog_id = $current_blog->blog_id;
-	$public  = $current_blog->public;
-	$site_id = $current_blog->site_id;
+$blog_id = $current_blog->blog_id;
+$public  = $current_blog->public;
+$site_id = $current_blog->site_id;
 
-	if( $site_id == 0 )
-		$site_id = 1;
+if( $site_id == 0 )
+	$site_id = 1;
+
+$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = '$site_id' AND meta_key = 'site_name'" );
+if( $current_site->site_name == null )
+	$current_site->site_name = ucfirst( $current_site->domain );
 
-	$current_site->site_name = $wpdb->get_var( "SELECT meta_value FROM $wpdb->sitemeta WHERE site_id = '$site_id' AND meta_key = 'site_name'" );
-	if( $current_site->site_name == null )
-		$current_site->site_name = ucfirst( $current_site->domain );
-}
 if( $blog_id == false ) {
     // no blog found, are we installing? Check if the table exists.
     if ( defined('WP_INSTALLING') ) {
-- 
cgit