summaryrefslogtreecommitdiffstats
path: root/wp-blog-header.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-13 17:21:00 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2008-06-13 17:21:00 +0000
commit12de05107e4c8b006bde6ee8916f34eb476d08da (patch)
tree123ee54ecd1f3f777373b7df54a4604012d43640 /wp-blog-header.php
parente51c7a9ca4bfdb45fa3ec7334bd33871e78c68b1 (diff)
downloadwordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.gz
wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.tar.xz
wordpress-mu-12de05107e4c8b006bde6ee8916f34eb476d08da.zip
WP Merge with revision 8075
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1328 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-blog-header.php')
-rw-r--r--wp-blog-header.php29
1 files changed, 17 insertions, 12 deletions
diff --git a/wp-blog-header.php b/wp-blog-header.php
index 49681f6..213ba2d 100644
--- a/wp-blog-header.php
+++ b/wp-blog-header.php
@@ -1,21 +1,26 @@
<?php
+/**
+ * Loads the WordPress environment and template.
+ *
+ * @package WordPress
+ */
-if (! isset($wp_did_header)):
-if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
- if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
- else $path = 'wp-admin/';
- include( "index-install.php" ); // install WPMU!
- die();
-}
+if ( !isset($wp_did_header) ) {
+ if ( !file_exists( dirname(__FILE__) . '/wp-config.php') ) {
+ if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) $path = '';
+ else $path = 'wp-admin/';
+ include( "index-install.php" ); // install WPMU!
+ die();
+ }
-$wp_did_header = true;
+ $wp_did_header = true;
-require_once( dirname(__FILE__) . '/wp-config.php');
+ require_once( dirname(__FILE__) . '/wp-load.php' );
-wp();
+ wp();
-require_once(ABSPATH . WPINC . '/template-loader.php');
+ require_once( ABSPATH . WPINC . '/template-loader.php' );
-endif;
+}
?>