From 1503e05616c295e6f980134dc341fa1a66dc9672 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Wed, 2 Jan 2008 16:00:05 +0000
Subject: Merge with WP 2.3.2

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1172 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-admin/admin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wp-admin/admin.php')

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 610544d..aaa8efa 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -1,4 +1,6 @@
 <?php
+define('WP_ADMIN', TRUE);
+
 if ( defined('ABSPATH') )
 	require_once( ABSPATH . 'wp-config.php');
 else
@@ -64,7 +66,7 @@ if (isset($plugin_page)) {
 		do_action('load-' . $plugin_page);
 
 		if (! isset($_GET['noheader']))
-			require_once(ABSPATH . '/wp-admin/admin-header.php');
+			require_once(ABSPATH . 'wp-admin/admin-header.php');
 
 		if ( file_exists(ABSPATH . MUPLUGINDIR . "/$plugin_page") )
 			include(ABSPATH . MUPLUGINDIR . "/$plugin_page");
-- 
cgit