diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-11 11:17:13 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-11 11:17:13 +0000 |
| commit | bab2ea758810a54a35f2f694a96feda3d11251f5 (patch) | |
| tree | b1e7b71e786416988a23fdc3aaec943e902a8507 /wp-blog-header.php | |
| parent | d54ae3cfab2008d084d081d1499d38fc6b158b2f (diff) | |
| download | wordpress-mu-bab2ea758810a54a35f2f694a96feda3d11251f5.tar.gz wordpress-mu-bab2ea758810a54a35f2f694a96feda3d11251f5.tar.xz wordpress-mu-bab2ea758810a54a35f2f694a96feda3d11251f5.zip | |
Merged changes from trunk
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1418 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-blog-header.php')
| -rw-r--r-- | wp-blog-header.php | 2 |
1 files changed, 1 insertions, 1 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! |