Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix inline documentation formatting in wp-admin/includes/admin-filters.php, introduced in [32653]. 

See #32529.

Built from https://develop.svn.wordpress.org/trunk@32671


git-svn-id: http://core.svn.wordpress.org/trunk@32641 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-05-31 02:00:26 +00:00
parent 0df0e0bf36
commit 9cb1017b3c
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-admin/includes/admin-filters.php
View File

@ -1,19 +1,20 @@
<?php
/**
* Administration hooks
* Administration hooks
*
* @package WordPress
* @subpackage Hooks
*
* @since 4.3.0
*/
/** Bookmark hooks */
// Bookmark hooks.
add_action( 'admin_page_access_denied', 'wp_link_manager_disabled_message' );
/** Dashboard hooks */
// Dashboard hooks.
add_action( 'activity_box_end', 'wp_dashboard_quota' );
/** Media hooks */
// Media hooks.
add_filter( 'media_upload_tabs', 'update_gallery_tab' );
add_filter( 'image_send_to_editor', 'image_add_caption', 20, 8 );
add_action( 'media_buttons', 'media_buttons' );
@ -38,7 +39,7 @@ add_filter( 'media_upload_library', 'media_upload_library' );
add_action( 'attachment_submitbox_misc_actions', 'attachment_submitbox_metadata' );
/** Misc hooks */
// 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 );
@ -53,13 +54,13 @@ add_filter( 'heartbeat_received', 'heartbeat_autosave', 500, 2 );
add_action( 'post_edit_form_tag', 'post_form_autocomplete_off' );
add_action( 'admin_head', 'wp_admin_canonical_url' );
/** Nav Menu hooks */
// Nav Menu hooks.
add_action( 'admin_head-nav-menus.php', '_wp_delete_orphaned_draft_menu_items' );
/** Plugin hooks */
// Plugin hooks.
add_filter( 'whitelist_options', 'option_update_filter' );
/** Plugin Install hooks */
// Plugin Install hooks.
add_action( 'install_plugins_featured', 'install_dashboard' );
add_action( 'install_plugins_upload', 'install_plugins_upload' );
add_action( 'install_plugins_search', 'display_plugins_table' );
@ -70,14 +71,14 @@ add_action( 'install_plugins_beta', 'display_plugins_table' );
add_action( 'install_plugins_favorites', 'display_plugins_table' );
add_action( 'install_plugins_pre_plugin-information', 'install_plugin_information' );
/** Template hooks */
// Template hooks.
add_action( 'admin_enqueue_scripts', array( 'WP_Internal_Pointers', 'enqueue_scripts' ) );
add_action( 'user_register', array( 'WP_Internal_Pointers', 'dismiss_pointers_for_new_users' ) );
/** Theme hooks */
// Theme hooks.
add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_templates' );
/** Theme Install hooks */
// Theme Install hooks.
// add_action('install_themes_dashboard', 'install_themes_dashboard');
// add_action('install_themes_upload', 'install_themes_upload', 10, 0);
// add_action('install_themes_search', 'display_themes');
@ -86,12 +87,12 @@ add_action( 'customize_controls_print_footer_scripts', 'customize_themes_print_t
// add_action('install_themes_updated', 'display_themes');
add_action( 'install_themes_pre_theme-information', 'install_theme_information' );
/** User hooks */
// 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' );
/** Update hooks */
// Update hooks.
add_filter( 'update_footer', 'core_update_footer' );
add_action( 'admin_notices', 'update_nag', 3 );
add_action( 'network_admin_notices', 'update_nag', 3 );
@ -100,8 +101,8 @@ add_action( 'admin_init', 'wp_theme_update_rows' );
add_action( 'admin_notices', 'maintenance_nag' );
add_action( 'network_admin_notices', 'maintenance_nag' );
/** Update Core hooks */
// Update Core hooks.
add_action( '_core_updated_successfully', '_redirect_to_about_wordpress' );
/** Upgrade hooks */
add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );
// Upgrade hooks.
add_action( 'upgrader_process_complete', array( 'Language_Pack_Upgrader', 'async_upgrade' ), 20 );

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.3-alpha-32670';
$wp_version = '4.3-alpha-32671';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.