From 112ca4e05582a7a8f18822dcf081b944ea8147a1 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sun, 18 May 2014 20:42:16 +0000
Subject: [PATCH] Because the `WP_ADMIN` constant name can be bound in multiple
 files, all instances should check `! defined` first. `wp-admin/admin.php`
 already has this check.

See #27881.

Built from https://develop.svn.wordpress.org/trunk@28478


git-svn-id: http://core.svn.wordpress.org/trunk@28305 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/admin-ajax.php   | 4 +++-
 wp-admin/admin-post.php   | 4 +++-
 wp-admin/admin.php        | 5 +++--
 wp-admin/async-upload.php | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php
index 94e0e6ace8..0606f228a9 100644
--- a/wp-admin/admin-ajax.php
+++ b/wp-admin/admin-ajax.php
@@ -14,7 +14,9 @@
  * @since 2.1.0
  */
 define( 'DOING_AJAX', true );
-define( 'WP_ADMIN', true );
+if ( ! defined( 'WP_ADMIN' ) ) {
+	define( 'WP_ADMIN', true );
+}
 
 /** Load WordPress Bootstrap */
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
diff --git a/wp-admin/admin-post.php b/wp-admin/admin-post.php
index 221fc8c2e3..f05cdf4e2d 100644
--- a/wp-admin/admin-post.php
+++ b/wp-admin/admin-post.php
@@ -9,7 +9,9 @@
  */
 
 /** We are located in WordPress Administration Screens */
-define('WP_ADMIN', true);
+if ( ! defined( 'WP_ADMIN' ) ) {
+	define( 'WP_ADMIN', true );
+}
 
 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');
diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 960f88fedb..1b837f21cb 100644
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -11,8 +11,9 @@
  *
  * @since 2.3.2
  */
-if ( ! defined('WP_ADMIN') )
-	define('WP_ADMIN', true);
+if ( ! defined( 'WP_ADMIN' ) ) {
+	define( 'WP_ADMIN', true );
+}
 
 if ( ! defined('WP_NETWORK_ADMIN') )
 	define('WP_NETWORK_ADMIN', false);
diff --git a/wp-admin/async-upload.php b/wp-admin/async-upload.php
index e43fb58449..9a76a6f25d 100644
--- a/wp-admin/async-upload.php
+++ b/wp-admin/async-upload.php
@@ -10,7 +10,9 @@ if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action']
 	define( 'DOING_AJAX', true );
 }
 
-define('WP_ADMIN', true);
+if ( ! defined( 'WP_ADMIN' ) ) {
+	define( 'WP_ADMIN', true );
+}
 
 if ( defined('ABSPATH') )
 	require_once(ABSPATH . 'wp-load.php');