Changeset 1422

Timestamp:

08/13/08 17:05:18 (4 months ago)

Author:

donncha

Message:

Added "DOMAIN_CURRENT_SITE" and "PATH_CURRENT_SITE" to hardcode current site.
Use object cache to store current site if only 1 site (probably majority of mu sites)

Files:

• trunk/index-install.php (modified) (3 diffs)
• trunk/wp-config-sample.php (modified) (1 diff)
• trunk/wpmu-settings.php (modified) (2 diffs)

trunk/index-install.php

@@ -338 +338 @@
-                                fwrite($handle, str_replace('BASE', $base, $line));
-                                break;
+                        case "define('DOMAIN_C":
+                                $domain = get_clean_basedomain();
+                                fwrite($handle, str_replace("current_site_domain", $domain, $line));
+                                break;
+                        case "define('PATH_CUR":
+                                fwrite($handle, str_replace("current_site_path", str_replace( 'index.php', '', $_SERVER[ 'REQUEST_URI' ] ), $line));
+                                break;
-                        case "define('SECRET_K":
-                        case "define('SECRET_S":
@@ -355 +362 @@
-}
-
+function get_clean_basedomain() {
+        global $wpdb;
+        $domain =   $wpdb->escape( $_POST[ 'basedomain' ] );
+        $domain = str_replace( 'http://', '', $domain );
+        if( substr( $domain, 0, 4 ) == 'www.' )
+                $domain = substr( $domain, 4 );
+        if( strpos( $domain, '/' ) )
+                $domain = substr( $domain, 0, strpos( $domain, '/' ) );
+        return $domain;
+}
+
-function step3() {
-        global $wpdb, $current_site, $dirs, $wpmu_version;
@@ -361 +379 @@
-                $base .= "/";
-        } 
-
-
-
-
-
-
+
-        $email = $wpdb->escape( $_POST[ 'email' ] );
-        if( $email == '' )

trunk/wp-config-sample.php

@@ -10 +10 @@
-define('VHOST', 'VHOSTSETTING'); 
-$base = 'BASE';
+define('DOMAIN_CURRENT_SITE', 'current_site_domain' );
+define('PATH_CURRENT_SITE', 'current_site_path' );
-
-// Change each KEY to a different unique phrase.  You won't have to remember the phrases later,

trunk/wpmu-settings.php

@@ -27 +27 @@
-function wpmu_current_site() {
-        global $wpdb, $current_site, $domain, $path, $sites;
+        if( defined( 'DOMAIN_CURRENT_SITE' ) && defined( 'PATH_CURRENT_SITE' ) ) {
+                $current_site->id = 1;
+                $current_site->domain = DOMAIN_CURRENT_SITE;
+                $current_site->path   = PATH_CURRENT_SITE;
+                return $current_site;
+        }
+
+        $current_site = wp_cache_get( "current_site", "site-options" );
+        if( $current_site )
+                return $current_site;
+                
+        $wpdb->suppress_errors();
+        $sites = $wpdb->get_results( "SELECT * FROM $wpdb->site" ); // usually only one site
+        if( count( $sites ) == 1 ) {
+                $current_site = $sites[0];
+                $path = $current_site->path;
+                wp_cache_set( "current_site", $current_site, "site-options" );
+                return $current_site;
+        }
-        $path = substr( $_SERVER[ 'REQUEST_URI' ], 0, 1 + strpos( $_SERVER[ 'REQUEST_URI' ], '/', 1 ) );
-        if( constant( 'VHOST' ) == 'yes' ) {
@@ -71 +90 @@
-}
-
-
-
-
-
-
-
-
-
-
+
-
-if( constant( 'VHOST' ) == 'yes' ) {