Changeset 28478

Timestamp:

05/18/2014 08:41:28 PM (11 years ago)

Author:

wonderboymusic

Message:

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.

Location:

trunk/src/wp-admin

Files:

• admin-ajax.php (modified) (1 diff)
• admin-post.php (modified) (1 diff)
• admin.php (modified) (1 diff)
• async-upload.php (modified) (1 diff)

trunk/src/wp-admin/admin-ajax.php

@@ -15 +15 @@
  */
 define( 'DOING_AJAX', true );
-define( 'WP_ADMIN', true );
+if ( ! defined( 'WP_ADMIN' ) ) {
+    define( 'WP_ADMIN', true );
+}
 
 /** Load WordPress Bootstrap */

trunk/src/wp-admin/admin-post.php

@@ -10 +10 @@
 
 /** We are located in WordPress Administration Screens */
-define('WP_ADMIN', true);
+if ( ! defined( 'WP_ADMIN' ) ) {
+    define( 'WP_ADMIN', true );
+}
 
 if ( defined('ABSPATH') )

trunk/src/wp-admin/admin.php

@@ -12 +12 @@
  * @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') )

trunk/src/wp-admin/async-upload.php

@@ -11 +11 @@
 }
 
-define('WP_ADMIN', true);
+if ( ! defined( 'WP_ADMIN' ) ) {
+    define( 'WP_ADMIN', true );
+}
 
 if ( defined('ABSPATH') )