From bb292c74c10e7538ac4fd9c54529942395e7c329 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 19 Jun 2015 21:17:20 +0000 Subject: [PATCH] Cleanup `(ms-)?admin-filters.php` Props johnjamesjacoby. Fixes #32529. git-svn-id: https://develop.svn.wordpress.org/trunk@32865 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/admin-filters.php | 72 ++++++++++++---------- src/wp-admin/includes/ms-admin-filters.php | 22 +++++-- 2 files changed, 58 insertions(+), 36 deletions(-) diff --git a/src/wp-admin/includes/admin-filters.php b/src/wp-admin/includes/admin-filters.php index 40939265c6..68e587dd8d 100644 --- a/src/wp-admin/includes/admin-filters.php +++ b/src/wp-admin/includes/admin-filters.php @@ -15,44 +15,52 @@ add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' ); add_action( 'activity_box_end', 'wp_dashboard_quota' ); // Media hooks. -add_filter( 'media_upload_tabs', 'update_gallery_tab' ); -add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); +add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' ); + add_action( 'media_buttons', 'media_buttons' ); -add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 ); -add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 ); - -add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' ); -add_action( 'post-html-upload-ui', 'media_upload_html_bypass' ); -add_filter( 'async_upload_image', 'get_media_item', 10, 2 ); -add_filter( 'async_upload_audio', 'get_media_item', 10, 2 ); -add_filter( 'async_upload_video', 'get_media_item', 10, 2 ); -add_filter( 'async_upload_file', 'get_media_item', 10, 2 ); - add_action( 'media_upload_image', 'wp_media_upload_handler' ); add_action( 'media_upload_audio', 'wp_media_upload_handler' ); add_action( 'media_upload_video', 'wp_media_upload_handler' ); add_action( 'media_upload_file', 'wp_media_upload_handler' ); +add_action( 'post-plupload-upload-ui', 'media_upload_flash_bypass' ); + +add_action( 'post-html-upload-ui', 'media_upload_html_bypass' ); + +add_filter( 'async_upload_image', 'get_media_item', 10, 2 ); +add_filter( 'async_upload_audio', 'get_media_item', 10, 2 ); +add_filter( 'async_upload_video', 'get_media_item', 10, 2 ); +add_filter( 'async_upload_file', 'get_media_item', 10, 2 ); + +add_filter( 'attachment_fields_to_save', 'image_attachment_fields_to_save', 10, 2 ); + +add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 ); + +add_filter( 'media_send_to_editor', 'image_media_send_to_editor', 10, 3 ); + add_filter( 'media_upload_gallery', 'media_upload_gallery' ); add_filter( 'media_upload_library', 'media_upload_library' ); -add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' ); +add_filter( 'media_upload_tabs', 'update_gallery_tab' ); // Misc hooks. -add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); -add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 ); +add_action( 'admin_head', 'wp_admin_canonical_url' ); add_action( 'admin_head', 'wp_color_scheme_settings' ); -add_action( 'admin_head', '_ipad_meta' ); -add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 ); -add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 ); -add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 ); -add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' ); -// Run later as we have to set DOING_AUTOSAVE for back-compat -add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); +add_action( 'admin_head', '_ipad_meta' ); + add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' ); -add_action( 'admin_head', 'wp_admin_canonical_url' ); + +add_action( 'update_option_home', 'update_home_siteurl', 10, 2 ); +add_action( 'update_option_siteurl', 'update_home_siteurl', 10, 2 ); +add_action( 'update_option_page_on_front', 'update_home_siteurl', 10, 2 ); + +add_filter( 'heartbeat_received', 'wp_check_locked_posts', 10, 3 ); +add_filter( 'heartbeat_received', 'wp_refresh_post_lock', 10, 3 ); +add_filter( 'heartbeat_received', 'wp_refresh_post_nonces', 10, 3 ); +add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 ); + +add_filter( 'heartbeat_settings', 'wp_heartbeat_set_suspension' ); // Nav Menu hooks. add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' ); @@ -89,17 +97,19 @@ add_action( 'install_themes_pre_theme-information', 'install_theme_information' // User hooks. add_action( 'admin_init', 'default_password_nag_handler' ); -add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 ); + add_action( 'admin_notices', 'default_password_nag' ); +add_action( 'profile_update', 'default_password_nag_edit_user', 10, 2 ); + // Update hooks. -add_filter( 'update_footer', 'core_update_footer' ); -add_action( 'admin_notices', 'update_nag', 3 ); -add_action( 'network_admin_notices', 'update_nag', 3 ); add_action( 'admin_init', 'wp_plugin_update_rows' ); -add_action( 'admin_init', 'wp_theme_update_rows' ); -add_action( 'admin_notices', 'maintenance_nag' ); -add_action( 'network_admin_notices', 'maintenance_nag' ); +add_action( 'admin_init', 'wp_theme_update_rows' ); + +add_action( 'admin_notices', 'update_nag', 3 ); +add_action( 'admin_notices', 'maintenance_nag', 10 ); + +add_filter( 'update_footer', 'core_update_footer' ); // Update Core hooks. add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' ); diff --git a/src/wp-admin/includes/ms-admin-filters.php b/src/wp-admin/includes/ms-admin-filters.php index b77c103fc1..b49490eb88 100644 --- a/src/wp-admin/includes/ms-admin-filters.php +++ b/src/wp-admin/includes/ms-admin-filters.php @@ -7,24 +7,36 @@ * @since 4.3.0 */ +// Media Hooks. add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' ); -add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); +// User Hooks +add_action( 'admin_notices', 'new_user_email_admin_notice' ); + +add_action( 'admin_page_access_denied', '_access_denied_splash', 99 ); + add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); add_action( 'personal_options_update', 'send_confirmation_on_profile_email' ); -add_action( 'admin_notices', 'new_user_email_admin_notice' ); +add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); +// Site Hooks. add_action( 'wpmueditblogaction', 'upload_space_setting' ); +// Taxonomy Hooks add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 ); -add_action( 'admin_page_access_denied', '_access_denied_splash', 99 ); +// Post Hooks. +add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 ); +// Tools Hooks. add_filter( 'import_allow_create_users', 'check_import_new_users' ); -add_action( 'admin_notices', 'site_admin_notice' ); +// Notices Hooks +add_action( 'admin_notices', 'site_admin_notice' ); add_action( 'network_admin_notices', 'site_admin_notice' ); -add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 ); +// Update Hooks +add_action( 'network_admin_notices', 'update_nag', 3 ); +add_action( 'network_admin_notices', 'maintenance_nag', 10 );