--- a/wp/wp-admin/admin.php Tue Jun 09 11:14:17 2015 +0000
+++ b/wp/wp-admin/admin.php Mon Oct 14 17:39:30 2019 +0200
@@ -48,7 +48,7 @@
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 @@
*
* @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,21 +84,33 @@
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');
+// Schedule Transient cleanup.
+if ( ! wp_next_scheduled( 'delete_expired_transients' ) && ! wp_installing() ) {
+ wp_schedule_event( time(), 'daily', 'delete_expired_transients' );
+}
+
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
+/**
+ * $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;
@@ -128,21 +140,7 @@
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' );
}
/**
@@ -151,7 +149,7 @@
* 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
*/
@@ -165,7 +163,7 @@
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' ]) )
@@ -213,7 +211,7 @@
*
* @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');
@@ -225,8 +223,9 @@
*/
do_action( $page_hook );
} else {
- if ( validate_file($plugin_page) )
- wp_die(__('Invalid plugin page'));
+ if ( validate_file( $plugin_page ) ) {
+ wp_die( __( 'Invalid plugin page.' ) );
+ }
if ( !( file_exists(WP_PLUGIN_DIR . "/$plugin_page") && is_file(WP_PLUGIN_DIR . "/$plugin_page") ) && !( file_exists(WPMU_PLUGIN_DIR . "/$plugin_page") && is_file(WPMU_PLUGIN_DIR . "/$plugin_page") ) )
wp_die(sprintf(__('Cannot load %s.'), htmlentities($plugin_page)));
@@ -243,7 +242,7 @@
*
* @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');
@@ -261,8 +260,9 @@
$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 ) );
@@ -281,7 +281,7 @@
*
* @since 3.5.0
*/
- do_action( 'load-importer-' . $importer );
+ do_action( "load-importer-{$importer}" );
$parent_file = 'tools.php';
$submenu_file = 'import.php';
@@ -302,7 +302,7 @@
*
* @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.
@@ -329,7 +329,7 @@
*
* @since 2.1.0
*/
- do_action( 'load-' . $pagenow );
+ do_action( "load-{$pagenow}" );
/*
* The following hooks are fired to ensure backward compatibility.
@@ -345,6 +345,8 @@
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' );
}
}