WordPress 3.4.2-scripts

[autoinstalls/wordpress.git] / wp-admin / includes / admin.php

diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php
index 37f5c8ec9d3814f578d36be5ac01fac14f96764a..439fcdb81e19b63837a6ae2bd356cb56423f656b 100644 (file)
--- a/wp-admin/includes/admin.php
+++ b/wp-admin/includes/admin.php
@@ -6,6 +6,13 @@
  * @subpackage Administration
  */
 
+if ( ! defined('WP_ADMIN') ) {
+       // This file is being included from a file other than wp-admin/admin.php, so
+       // some setup was skipped. Make sure the admin message catalog is loaded since
+       // load_default_textdomain() will not have done so in this context.
+       load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+}
+
 /** WordPress Bookmark Administration API */
 require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
 
@@ -33,6 +40,9 @@ require_once(ABSPATH . 'wp-admin/includes/plugin.php');
 /** WordPress Post Administration API */
 require_once(ABSPATH . 'wp-admin/includes/post.php');
 
+/** WordPress Administration Screen API */
+require_once(ABSPATH . 'wp-admin/includes/screen.php');
+
 /** WordPress Taxonomy Administration API */
 require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
 
@@ -55,10 +65,8 @@ require_once(ABSPATH . 'wp-admin/includes/update.php');
 /** WordPress Deprecated Administration API */
 require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
 
-/** WordPress Multi-Site support API */
+/** WordPress Multisite support API */
 if ( is_multisite() ) {
        require_once(ABSPATH . 'wp-admin/includes/ms.php');
        require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');
 }
-
-?>