WordPress 4.7.2

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

diff --git a/wp-admin/admin.php b/wp-admin/admin.php
index d3e58d254997f592038b57f53e7f9633a9000872..2dd315daf9d43c098d1fd7cc14c08885429c09ca 100644 (file)
--- a/wp-admin/admin.php
+++ b/wp-admin/admin.php
@@ -48,7 +48,7 @@ if ( get_option('db_upgraded') ) {
                exit;
 
        /**
-        * Filter whether to attempt to perform the multisite DB upgrade routine.
+        * Filters 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, the DB upgrade routine is automatically fired, but only
@@ -59,7 +59,7 @@ 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();
@@ -84,13 +84,13 @@ 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' );
 
@@ -138,21 +138,7 @@ else
        require(ABSPATH . 'wp-admin/menu.php');
 
 if ( current_user_can( 'manage_options' ) ) {
-       /**
-        * Filter the maximum memory limit available for administration screens.
-        *
-        * This only applies to administrators, who may require more memory for tasks like updates.
-        * Memory limits when processing images (uploaded or edited by users of any role) are
-        * 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.
-        *
-        * @since 3.0.0
-        *
-        * @param string 'WP_MAX_MEMORY_LIMIT' The maximum WordPress memory limit. Default 256M.
-        */
-       @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+       wp_raise_memory_limit( 'admin' );
 }
 
 /**
@@ -161,7 +147,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 {@see 'init'} hook, which fires earlier.
  *
  * @since 2.5.0
  */
@@ -175,7 +161,7 @@ if ( isset($plugin_page) ) {
        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().
+               // Back-compat 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' ]) )
@@ -223,7 +209,7 @@ if ( isset($plugin_page) ) {
                 *
                 * @since 2.1.0
                 */
-               do_action( 'load-' . $page_hook );
+               do_action( "load-{$page_hook}" );
                if (! isset($_GET['noheader']))
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
 
@@ -253,7 +239,7 @@ if ( isset($plugin_page) ) {
                 *
                 * @since 1.5.0
                 */
-               do_action( 'load-' . $plugin_page );
+               do_action( "load-{$plugin_page}" );
 
                if ( !isset($_GET['noheader']))
                        require_once(ABSPATH . 'wp-admin/admin-header.php');
@@ -271,8 +257,9 @@ if ( isset($plugin_page) ) {
 
        $importer = $_GET['import'];
 
-       if ( ! current_user_can('import') )
-               wp_die(__('You are not allowed to import.'));
+       if ( ! current_user_can( 'import' ) ) {
+               wp_die( __( 'Sorry, you are not allowed to import content.' ) );
+       }
 
        if ( validate_file($importer) ) {
                wp_redirect( admin_url( 'import.php?invalid=' . $importer ) );
@@ -291,7 +278,7 @@ if ( isset($plugin_page) ) {
         *
         * @since 3.5.0
         */
-       do_action( 'load-importer-' . $importer );
+       do_action( "load-importer-{$importer}" );
 
        $parent_file = 'tools.php';
        $submenu_file = 'import.php';
@@ -312,7 +299,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.
@@ -339,7 +326,7 @@ if ( isset($plugin_page) ) {
         *
         * @since 2.1.0
         */
-       do_action( 'load-' . $pagenow );
+       do_action( "load-{$pagenow}" );
 
        /*
         * The following hooks are fired to ensure backward compatibility.
@@ -355,6 +342,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' );
        }
 }