Merged changes from trunk

git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1418 7be80a69-a1ef-0310-a953-fb0f7c49ff36

3 files changed, 3 insertions, 3 deletions

diff --git a/wp-blog-header.php b/wp-blog-header.php
index 213ba2d..ad1f602 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -6,7 +6,7 @@
  */
 
 if ( !isset($wp_did_header) ) {
-	if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+	if ( !file_exists( dirname(__FILE__) . '/wp-config.php') && !file_exists( dirname( dirname(__FILE__) ) . '/wp-config.php')) {
 		if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
 		else $path = 'wp-admin/';
 		include( "index-install.php" ); // install WPMU!
diff --git a/wp-content/blogs.php b/wp-content/blogs.php
index 2366152..ba7a2cb 100644
--- a/wp-content/blogs.php
+++ b/wp-content/blogs.php
@@ -1,6 +1,6 @@
 <?php

 define( 'SHORTINIT', true ); // this prevents most of WP from being loaded

-require_once( dirname( dirname( __FILE__) ) . '/wp-config.php' ); // absolute includes are faster

+require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' ); // absolute includes are faster

 

 if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {

 	status_header( 404 );

diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index f48a4c9..86ceb86 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -264,7 +264,7 @@ function load_textdomain($domain, $mofile) {
 function load_default_textdomain() {
 	$locale = get_locale();
 
-	$mofile = ABSPATH . LANGDIR . "/$locale.mo";
+	$mofile = WP_LANG_DIR . "/$locale.mo";
 
 	load_textdomain('default', $mofile);
 }