WordPress 4.5.1-scripts

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index 85979327011b8f06f83b882d7a7bb7d6d78c84b7..a54ca21ba73d4aab2cbe3bb814e71d6f20694f0b 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -11,8 +11,9 @@
  *
  * @since 2.3.2
  */
  *
  * @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);
 
 if ( ! defined('WP_NETWORK_ADMIN') )
        define('WP_NETWORK_ADMIN', false);


@@ -50,29 +51,27 @@ if ( get_option('db_upgraded') ) {
         * Filter whether to attempt to perform the multisite DB upgrade routine.
         *
         * In single site, the user would be redirected to wp-admin/upgrade.php.
         * Filter whether to attempt to perform the multisite DB upgrade routine.
         *
         * In single site, the user would be redirected to wp-admin/upgrade.php.

-        * In multisite, it is automatically fired, but only when this filter
-        * returns true.
+        * In multisite, the DB upgrade routine is automatically fired, but only
+        * when this filter returns true.

         *
         * If the network is 50 sites or less, it will run every time. Otherwise,
         * it will throttle itself to reduce load.
         *
         * @since 3.0.0
         *
         *
         * If the network is 50 sites or less, it will run every time. Otherwise,
         * it will throttle itself to reduce load.
         *
         * @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();
         */
        } 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' ) );
                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' ) );

-                       /**
-                        * Fires after the multisite DB upgrade is complete.
-                        *
-                        * @since 3.0.0
-                        *
-                        * @param array|WP_Error $response The upgrade response array or WP_Error on failure.
-                        */
+                       /** This action is documented in wp-admin/network/upgrade.php */

                        do_action( 'after_mu_upgrade', $response );
                        unset($response);
                }
                        do_action( 'after_mu_upgrade', $response );
                        unset($response);
                }


@@ -85,16 +84,35 @@ require_once(ABSPATH . 'wp-admin/includes/admin.php');
 auth_redirect();
 
 // Schedule trash collection
 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();
 
        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' );
 
 
 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']) ) {
 $editing = false;
 
 if ( isset($_GET['page']) ) {


@@ -128,7 +146,7 @@ if ( current_user_can( 'manage_options' ) ) {
         * handled separately.
         *
         * The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
         * 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
         *
         *
         * @since 3.0.0
         *


@@ -143,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.
  *
  * 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
  */
  *
  * @since 2.5.0
  */


@@ -156,7 +174,8 @@ if ( isset($plugin_page) ) {
                $the_parent = $pagenow;
        if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
                $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);
                $the_parent = $pagenow;
        if ( ! $page_hook = get_plugin_page_hook($plugin_page, $the_parent) ) {
                $page_hook = get_plugin_page_hook($plugin_page, $plugin_page);

-               // backwards compatibility for plugins using add_management_page
+
+               // Backwards compatibility for plugins using add_management_page().

                if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
                        // There could be plugin specific params on the URL, so we need the whole query string
                        if ( !empty($_SERVER[ 'QUERY_STRING' ]) )
                if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) {
                        // There could be plugin specific params on the URL, so we need the whole query string
                        if ( !empty($_SERVER[ 'QUERY_STRING' ]) )


@@ -171,12 +190,13 @@ if ( isset($plugin_page) ) {
 }
 
 $hook_suffix = '';
 }
 
 $hook_suffix = '';

-if ( isset($page_hook) )
+if ( isset( $page_hook ) ) {

        $hook_suffix = $page_hook;
        $hook_suffix = $page_hook;

-else if ( isset($plugin_page) )
+} elseif ( isset( $plugin_page ) ) {

        $hook_suffix = $plugin_page;
        $hook_suffix = $plugin_page;

-else if ( isset($pagenow) )
+} elseif ( isset( $pagenow ) ) {

        $hook_suffix = $pagenow;
        $hook_suffix = $pagenow;

+}

 
 set_current_screen();
 
 
 set_current_screen();
 


@@ -189,14 +209,14 @@ if ( isset($plugin_page) ) {
                 * The load-* hook fires in a number of contexts. This hook is for plugin screens
                 * where a callback is provided when the screen is registered.
                 *
                 * The load-* hook fires in a number of contexts. This hook is for plugin screens
                 * where a callback is provided when the screen is registered.
                 *

-                * The dynamic portion of the hook name, $page_hook, refers to a mixture of plugin
+                * The dynamic portion of the hook name, `$page_hook`, refers to a mixture of plugin

                 * page information including:
                 * 1. The page type. If the plugin page is registered as a submenu page, such as for
                 *    Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'.
                 * 2. A separator of '_page_'.
                 * 3. The plugin basename minus the file extension.
                 *
                 * page information including:
                 * 1. The page type. If the plugin page is registered as a submenu page, such as for
                 *    Settings, the page type would be 'settings'. Otherwise the type is 'toplevel'.
                 * 2. A separator of '_page_'.
                 * 3. The plugin basename minus the file extension.
                 *

-                * Together, the three parts form the $page_hook. Citing the example above,
+                * Together, the three parts form the `$page_hook`. Citing the example above,

                 * the hook name used would be 'load-settings_page_pluginbasename'.
                 *
                 * @see get_plugin_page_hook()
                 * the hook name used would be 'load-settings_page_pluginbasename'.
                 *
                 * @see get_plugin_page_hook()


@@ -210,8 +230,7 @@ if ( isset($plugin_page) ) {
                /**
                 * Used to call the registered callback for a plugin screen.
                 *
                /**
                 * Used to call the registered callback for a plugin screen.
                 *

-                * @access private
-                *
+                * @ignore

                 * @since 1.5.0
                 */
                do_action( $page_hook );
                 * @since 1.5.0
                 */
                do_action( $page_hook );


@@ -228,7 +247,7 @@ if ( isset($plugin_page) ) {
                 * The load-* hook fires in a number of contexts. This hook is for plugin screens
                 * where the file to load is directly included, rather than the use of a function.
                 *
                 * The load-* hook fires in a number of contexts. This hook is for plugin screens
                 * where the file to load is directly included, rather than the use of a function.
                 *

-                * The dynamic portion of the hook name, $plugin_page, refers to the plugin basename.
+                * The dynamic portion of the hook name, `$plugin_page`, refers to the plugin basename.

                 *
                 * @see plugin_basename()
                 *
                 *
                 * @see plugin_basename()
                 *


@@ -248,7 +267,7 @@ if ( isset($plugin_page) ) {
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();
        include(ABSPATH . 'wp-admin/admin-footer.php');
 
        exit();

-} else if (isset($_GET['import'])) {
+} elseif ( isset( $_GET['import'] ) ) {

 
        $importer = $_GET['import'];
 
 
        $importer = $_GET['import'];
 


@@ -268,7 +287,7 @@ if ( isset($plugin_page) ) {
        /**
         * Fires before an importer screen is loaded.
         *
        /**
         * Fires before an importer screen is loaded.
         *

-        * The dynamic portion of the hook name, $importer, refers to the importer slug.
+        * The dynamic portion of the hook name, `$importer`, refers to the importer slug.

         *
         * @since 3.5.0
         */
         *
         * @since 3.5.0
         */


@@ -293,10 +312,11 @@ if ( isset($plugin_page) ) {
         *
         * @since 3.1.0
         *
         *
         * @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 ) )
+       if ( apply_filters( 'force_filtered_html_on_import', false ) ) {

                kses_init_filters();  // Always filter imported data with kses on multisite.
                kses_init_filters();  // Always filter imported data with kses on multisite.

+       }

 
        call_user_func($wp_importers[$importer][2]);
 
 
        call_user_func($wp_importers[$importer][2]);
 


@@ -312,15 +332,19 @@ if ( isset($plugin_page) ) {
         *
         * The load-* hook fires in a number of contexts. This hook is for core screens.
         *
         *
         * The load-* hook fires in a number of contexts. This hook is for core screens.
         *

-        * The dynamic portion of the hook name, $pagenow, is a global variable
+        * The dynamic portion of the hook name, `$pagenow`, is a global variable

         * referring to the filename of the current page, such as 'admin.php',
         * referring to the filename of the current page, such as 'admin.php',

-        * 'post-new.php' etc. A complete hook for the latter would be 'load-post-new.php'.
+        * 'post-new.php' etc. A complete hook for the latter would be
+        * 'load-post-new.php'.

         *
         * @since 2.1.0
         */
        do_action( 'load-' . $pagenow );
         *
         * @since 2.1.0
         */
        do_action( 'load-' . $pagenow );

-       // Backwards compatibility with old load-page-new.php, load-page.php,
-       // and load-categories.php actions.
+
+       /*
+        * The following hooks are fired to ensure backward compatibility.
+        * In all other cases, 'load-' . $pagenow should be used instead.
+        */

        if ( $typenow == 'page' ) {
                if ( $pagenow == 'post-new.php' )
                        do_action( 'load-page-new.php' );
        if ( $typenow == 'page' ) {
                if ( $pagenow == 'post-new.php' )
                        do_action( 'load-page-new.php' );


@@ -331,6 +355,8 @@ if ( isset($plugin_page) ) {
                        do_action( 'load-categories.php' );
                elseif ( $taxnow == 'link_category' )
                        do_action( 'load-edit-link-categories.php' );
                        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' );

        }
 }
 
        }
 }
 


@@ -338,8 +364,8 @@ if ( ! empty( $_REQUEST['action'] ) ) {
        /**
         * Fires when an 'action' request variable is sent.
         *
        /**
         * Fires when an 'action' request variable is sent.
         *

-        * The dynamic portion of the hook name, $_REQUEST['action'],
-        * refers to the action derived from the GET or POST request.
+        * The dynamic portion of the hook name, `$_REQUEST['action']`,
+        * refers to the action derived from the `GET` or `POST` request.

         *
         * @since 2.6.0
         */
         *
         * @since 2.6.0
         */