WordPress 4.5.2

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 793dc511f6824e95531a881286271664ee6a1465..a54ca21ba73d4aab2cbe3bb814e71d6f20694f0b 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -59,11 +59,15 @@ if ( get_option('db_upgraded') ) {
         *
         * @since 3.0.0
         *
-        * @param bool true Whether to perform the Multisite upgrade routine. Default true.
+        * @param bool $do_mu_upgrade Whether to perform the Multisite upgrade routine. Default true.
         */
        } elseif ( apply_filters( 'do_mu_upgrade', true ) ) {
                $c = get_blog_count();
-               // If 50 or fewer sites, run every time. Else, run "about ten percent" of the time. Shh, don't check that math.
+
+               /*
+                * If there are 50 or fewer sites, run every time. Otherwise, throttle to reduce load:
+                * attempt to do no more than threshold value, with some +/- allowed.
+                */
                if ( $c <= 50 || ( $c > 50 && mt_rand( 0, (int)( $c / 50 ) ) == 1 ) ) {
                        require_once( ABSPATH . WPINC . '/http.php' );
                        $response = wp_remote_get( admin_url( 'upgrade.php?step=1' ), array( 'timeout' => 120, 'httpversion' => '1.1' ) );
@@ -80,16 +84,35 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php');
 auth_redirect();
 
 // Schedule trash collection
-if ( !wp_next_scheduled('wp_scheduled_delete') && !defined('WP_INSTALLING') )
+if ( ! wp_next_scheduled( 'wp_scheduled_delete' ) && ! wp_installing() )
        wp_schedule_event(time(), 'daily', 'wp_scheduled_delete');
 
 set_screen_options();
 
-$date_format = get_option('date_format');
-$time_format = get_option('time_format');
+$date_format = __( 'F j, Y' );
+$time_format = __( 'g:i a' );
 
 wp_enqueue_script( 'common' );
 
+
+
+
+/**
+ * $pagenow is set in vars.php
+ * $wp_importers is sometimes set in wp-admin/includes/import.php
+ * The remaining variables are imported as globals elsewhere, declared as globals here
+ *
+ * @global string $pagenow
+ * @global array  $wp_importers
+ * @global string $hook_suffix
+ * @global string $plugin_page
+ * @global string $typenow
+ * @global string $taxnow
+ */
+global $pagenow, $wp_importers, $hook_suffix, $plugin_page, $typenow, $taxnow;
+
+$page_hook = null;
+
 $editing = false;
 
 if ( isset($_GET['page']) ) {
@@ -123,7 +146,7 @@ if ( current_user_can( 'manage_options' ) ) {
         * handled separately.
         *
         * The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
-        * when in the administration back-end. The default is 256M, or 256 megabytes of memory.
+        * when in the administration back end. The default is 256M, or 256 megabytes of memory.
         *
         * @since 3.0.0
         *
@@ -138,7 +161,7 @@ if ( current_user_can( 'manage_options' ) ) {
  * Note, this does not just run on user-facing admin screens.
  * It runs on admin-ajax.php and admin-post.php as well.
  *
- * This is roughly analgous to the more general 'init' hook, which fires earlier.
+ * This is roughly analogous to the more general 'init' hook, which fires earlier.
  *
  * @since 2.5.0
  */
@@ -167,12 +190,13 @@ if ( isset($plugin_page) ) {
 }
 
 $hook_suffix = '';
-if ( isset($page_hook) )
+if ( isset( $page_hook ) ) {
        $hook_suffix = $page_hook;
-else if ( isset($plugin_page) )
+} elseif ( isset( $plugin_page ) ) {
        $hook_suffix = $plugin_page;
-else if ( isset($pagenow) )
+} elseif ( isset( $pagenow ) ) {
        $hook_suffix = $pagenow;
+}
 
 set_current_screen();
 
@@ -206,7 +230,7 @@ if ( isset($plugin_page) ) {
                /**
                 * Used to call the registered callback for a plugin screen.
                 *
-                * @internal
+                * @ignore
                 * @since 1.5.0
                 */
                do_action( $page_hook );
@@ -243,7 +267,7 @@ if ( isset($plugin_page) ) {
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();
-} else if (isset($_GET['import'])) {
+} elseif ( isset( $_GET['import'] ) ) {
 
        $importer = $_GET['import'];
 
@@ -288,7 +312,7 @@ if ( isset($plugin_page) ) {
         *
         * @since 3.1.0
         *
-        * @param bool false Whether to force data to be filtered through kses. Default false.
+        * @param bool $force Whether to force data to be filtered through kses. Default false.
         */
        if ( apply_filters( 'force_filtered_html_on_import', false ) ) {
                kses_init_filters();  // Always filter imported data with kses on multisite.
@@ -331,6 +355,8 @@ if ( isset($plugin_page) ) {
                        do_action( 'load-categories.php' );
                elseif ( $taxnow == 'link_category' )
                        do_action( 'load-edit-link-categories.php' );
+       } elseif( 'term.php' === $pagenow ) {
+               do_action( 'load-edit-tags.php' );
        }
 }