From b33d0da84c0282916bfaa367d4116c4d3e7d795e Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Mon, 2 Dec 2013 03:52:23 +0000 Subject: [PATCH] Remove all screen_icon() calls and deprecate the functions, props TobiasBg, fixes #26119 git-svn-id: https://develop.svn.wordpress.org/trunk@26518 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/comment.php | 1 - src/wp-admin/custom-background.php | 1 - src/wp-admin/custom-header.php | 2 - src/wp-admin/edit-comments.php | 1 - src/wp-admin/edit-form-advanced.php | 1 - src/wp-admin/edit-form-comment.php | 1 - src/wp-admin/edit-link-form.php | 1 - src/wp-admin/edit-tag-form.php | 1 - src/wp-admin/edit-tags.php | 1 - src/wp-admin/edit.php | 1 - src/wp-admin/export.php | 1 - src/wp-admin/import.php | 1 - .../includes/class-wp-upgrader-skins.php | 1 - src/wp-admin/includes/deprecated.php | 51 +++++++++++++++++++ src/wp-admin/includes/screen.php | 47 ----------------- src/wp-admin/index.php | 1 - src/wp-admin/link-manager.php | 1 - src/wp-admin/media-new.php | 1 - src/wp-admin/media.php | 1 - src/wp-admin/ms-delete-site.php | 1 - src/wp-admin/my-sites.php | 1 - src/wp-admin/nav-menus.php | 1 - src/wp-admin/network.php | 1 - src/wp-admin/network/index.php | 1 - src/wp-admin/network/settings.php | 1 - src/wp-admin/network/site-info.php | 1 - src/wp-admin/network/site-new.php | 1 - src/wp-admin/network/site-settings.php | 1 - src/wp-admin/network/site-themes.php | 1 - src/wp-admin/network/site-users.php | 1 - src/wp-admin/network/sites.php | 1 - src/wp-admin/network/themes.php | 3 -- src/wp-admin/network/upgrade.php | 1 - src/wp-admin/network/user-new.php | 1 - src/wp-admin/network/users.php | 3 -- src/wp-admin/options-discussion.php | 1 - src/wp-admin/options-general.php | 1 - src/wp-admin/options-media.php | 1 - src/wp-admin/options-permalink.php | 1 - src/wp-admin/options-reading.php | 1 - src/wp-admin/options-writing.php | 1 - src/wp-admin/options.php | 1 - src/wp-admin/plugin-editor.php | 1 - src/wp-admin/plugin-install.php | 1 - src/wp-admin/plugins.php | 3 -- src/wp-admin/revision.php | 1 - src/wp-admin/theme-editor.php | 1 - src/wp-admin/theme-install.php | 3 -- src/wp-admin/tools.php | 1 - src/wp-admin/update-core.php | 4 -- src/wp-admin/upload.php | 1 - src/wp-admin/user-edit.php | 1 - src/wp-admin/user-new.php | 1 - src/wp-admin/users.php | 3 -- src/wp-admin/widgets.php | 2 - 55 files changed, 51 insertions(+), 115 deletions(-) diff --git a/src/wp-admin/comment.php b/src/wp-admin/comment.php index c2d57f08d9..d4d37ee21d 100644 --- a/src/wp-admin/comment.php +++ b/src/wp-admin/comment.php @@ -115,7 +115,6 @@ case 'spam' :
-

-

updated) ) { ?>
diff --git a/src/wp-admin/custom-header.php b/src/wp-admin/custom-header.php index 7b1a4b30a5..7f222f7cb7 100644 --- a/src/wp-admin/custom-header.php +++ b/src/wp-admin/custom-header.php @@ -450,7 +450,6 @@ class Custom_Image_Header { ?>
-

updated ) ) { ?> @@ -724,7 +723,6 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?> ?>
-

diff --git a/src/wp-admin/edit-comments.php b/src/wp-admin/edit-comments.php index f084ab5fc5..b12264a02c 100644 --- a/src/wp-admin/edit-comments.php +++ b/src/wp-admin/edit-comments.php @@ -140,7 +140,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-

cap->create_posts ) ) diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php index 6537169d0e..55f8df635b 100644 --- a/src/wp-admin/edit-form-comment.php +++ b/src/wp-admin/edit-form-comment.php @@ -13,7 +13,6 @@ if ( !defined('ABSPATH') ) comment_ID) ?>
-

diff --git a/src/wp-admin/edit-link-form.php b/src/wp-admin/edit-link-form.php index a44944bbe2..d4a38cab56 100644 --- a/src/wp-admin/edit-link-form.php +++ b/src/wp-admin/edit-link-form.php @@ -70,7 +70,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/edit-tag-form.php b/src/wp-admin/edit-tag-form.php index 5e1ca0eeef..f021b2a3a8 100644 --- a/src/wp-admin/edit-tag-form.php +++ b/src/wp-admin/edit-tag-form.php @@ -27,7 +27,6 @@ if ( 'category' == $taxonomy ) { do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
-

labels->edit_item; ?>

> diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php index a253d92f97..56fa11a1c2 100644 --- a/src/wp-admin/edit-tags.php +++ b/src/wp-admin/edit-tags.php @@ -301,7 +301,6 @@ if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) { ?>
-

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> diff --git a/src/wp-admin/edit.php b/src/wp-admin/edit.php index 8d32036117..e98da90ff1 100644 --- a/src/wp-admin/edit.php +++ b/src/wp-admin/edit.php @@ -265,7 +265,6 @@ $bulk_counts = array_filter( $bulk_counts ); require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

labels->name ); if ( current_user_can( $post_type_object->cap->create_posts ) ) diff --git a/src/wp-admin/export.php b/src/wp-admin/export.php index 4f67c08520..e0811c324d 100644 --- a/src/wp-admin/export.php +++ b/src/wp-admin/export.php @@ -144,7 +144,6 @@ function export_date_options( $post_type = 'post' ) { ?>
-

diff --git a/src/wp-admin/import.php b/src/wp-admin/import.php index 076f0d1f3d..e85bf7012b 100644 --- a/src/wp-admin/import.php +++ b/src/wp-admin/import.php @@ -52,7 +52,6 @@ $parent_file = 'tools.php'; ?>
-

%s importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?>

diff --git a/src/wp-admin/includes/class-wp-upgrader-skins.php b/src/wp-admin/includes/class-wp-upgrader-skins.php index 31c5dbb4f5..71a1293e8b 100644 --- a/src/wp-admin/includes/class-wp-upgrader-skins.php +++ b/src/wp-admin/includes/class-wp-upgrader-skins.php @@ -51,7 +51,6 @@ class WP_Upgrader_Skin { return; $this->done_header = true; echo '
'; - screen_icon(); echo '

' . $this->options['title'] . '

'; } function footer() { diff --git a/src/wp-admin/includes/deprecated.php b/src/wp-admin/includes/deprecated.php index e6d42abde8..ff87729a98 100644 --- a/src/wp-admin/includes/deprecated.php +++ b/src/wp-admin/includes/deprecated.php @@ -1134,3 +1134,54 @@ function wp_update_theme($theme, $feedback = '') { function the_attachment_links( $id = false ) { _deprecated_function( __FUNCTION__, '3.7' ); } + +/** + * Displays a screen icon. + * + * @uses get_screen_icon() + * @since 2.7.0 + * @deprecated 3.8.0 + * + * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object) + * which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID. + */ +function screen_icon( $screen = '' ) { + _deprecated_function( __FUNCTION__, '3.8' ); + echo get_screen_icon( $screen ); +} + +/** + * Gets a screen icon. + * + * @since 3.2.0 + * @deprecated 3.8.0 + * + * @global $post_ID + * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object) + * which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID. + * @return string HTML for the screen icon. + */ +function get_screen_icon( $screen = '' ) { + _deprecated_function( __FUNCTION__, '3.8' ); + if ( empty( $screen ) ) + $screen = get_current_screen(); + elseif ( is_string( $screen ) ) + $icon_id = $screen; + + $class = 'icon32'; + + if ( empty( $icon_id ) ) { + if ( ! empty( $screen->parent_base ) ) + $icon_id = $screen->parent_base; + else + $icon_id = $screen->base; + + if ( 'page' == $screen->post_type ) + $icon_id = 'edit-pages'; + + if ( $screen->post_type ) + $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $screen->post_type ); + } + + return '

'; +} \ No newline at end of file diff --git a/src/wp-admin/includes/screen.php b/src/wp-admin/includes/screen.php index 33f91fea63..85ab71248f 100644 --- a/src/wp-admin/includes/screen.php +++ b/src/wp-admin/includes/screen.php @@ -124,53 +124,6 @@ function add_screen_option( $option, $args = array() ) { $current_screen->add_option( $option, $args ); } -/** - * Displays a screen icon. - * - * @uses get_screen_icon() - * @since 2.7.0 - * - * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object) - * which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID. - */ -function screen_icon( $screen = '' ) { - echo get_screen_icon( $screen ); -} - -/** - * Gets a screen icon. - * - * @since 3.2.0 - * - * @global $post_ID - * @param string|WP_Screen $screen Optional. Accepts a screen object (and defaults to the current screen object) - * which it uses to determine an icon HTML ID. Or, if a string is provided, it is used to form the icon HTML ID. - * @return string HTML for the screen icon. - */ -function get_screen_icon( $screen = '' ) { - if ( empty( $screen ) ) - $screen = get_current_screen(); - elseif ( is_string( $screen ) ) - $icon_id = $screen; - - $class = 'icon32'; - - if ( empty( $icon_id ) ) { - if ( ! empty( $screen->parent_base ) ) - $icon_id = $screen->parent_base; - else - $icon_id = $screen->base; - - if ( 'page' == $screen->post_type ) - $icon_id = 'edit-pages'; - - if ( $screen->post_type ) - $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $screen->post_type ); - } - - return '

'; -} - /** * Get the current screen object * diff --git a/src/wp-admin/index.php b/src/wp-admin/index.php index 87cfd709d7..88b1587fd1 100644 --- a/src/wp-admin/index.php +++ b/src/wp-admin/index.php @@ -93,7 +93,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-

' . __('Search results for “%s”') . '', esc_html( wp_unslash($_REQUEST['s']) ) ); ?> diff --git a/src/wp-admin/media-new.php b/src/wp-admin/media-new.php index d8f8b63347..75f49f1008 100644 --- a/src/wp-admin/media-new.php +++ b/src/wp-admin/media-new.php @@ -65,7 +65,6 @@ if ( get_user_setting('uploader') || isset( $_GET['browser-uploader'] ) ) $form_class .= ' html-uploader'; ?>
-

diff --git a/src/wp-admin/media.php b/src/wp-admin/media.php index c9f0348359..1462f7d42a 100644 --- a/src/wp-admin/media.php +++ b/src/wp-admin/media.php @@ -103,7 +103,6 @@ case 'edit' : ?>
-

'; -screen_icon(); echo '

' . esc_html( $title ) . '

'; if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) { diff --git a/src/wp-admin/my-sites.php b/src/wp-admin/my-sites.php index 468d1103c6..f882964afc 100644 --- a/src/wp-admin/my-sites.php +++ b/src/wp-admin/my-sites.php @@ -56,7 +56,6 @@ if ( $updated ) { ?>
-

set_help_sidebar( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/network.php b/src/wp-admin/network.php index d04f2cc966..fe7effe001 100644 --- a/src/wp-admin/network.php +++ b/src/wp-admin/network.php @@ -136,7 +136,6 @@ get_current_screen()->set_help_sidebar( include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-

diff --git a/src/wp-admin/network/settings.php b/src/wp-admin/network/settings.php index e8d72592c9..8b1f4b2119 100644 --- a/src/wp-admin/network/settings.php +++ b/src/wp-admin/network/settings.php @@ -84,7 +84,6 @@ if ( isset( $_GET['updated'] ) ) { ?>
-

diff --git a/src/wp-admin/network/site-info.php b/src/wp-admin/network/site-info.php index 6a952b646f..6607b8fe1c 100644 --- a/src/wp-admin/network/site-info.php +++ b/src/wp-admin/network/site-info.php @@ -96,7 +96,6 @@ require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-

-

-

;
-

-

diff --git a/src/wp-admin/network/themes.php b/src/wp-admin/network/themes.php index 264f90ed83..135c1e4138 100644 --- a/src/wp-admin/network/themes.php +++ b/src/wp-admin/network/themes.php @@ -90,7 +90,6 @@ if ( $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '
'; - screen_icon(); echo '

' . esc_html( $title ) . '

'; $url = self_admin_url('update.php?action=update-selected-themes&themes=' . urlencode( join(',', $themes) )); @@ -137,7 +136,6 @@ if ( $action ) {
' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '

'; ?>

@@ -227,7 +225,6 @@ require_once(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> diff --git a/src/wp-admin/network/upgrade.php b/src/wp-admin/network/upgrade.php index 96137b34de..8fdcf37e9f 100644 --- a/src/wp-admin/network/upgrade.php +++ b/src/wp-admin/network/upgrade.php @@ -39,7 +39,6 @@ if ( ! current_user_can( 'manage_network' ) ) wp_die( __( 'You do not have permission to access this page.' ) ); echo '
'; -screen_icon('tools'); echo '

' . __( 'Upgrade Network' ) . '

'; $action = isset($_GET['action']) ? $_GET['action'] : 'show'; diff --git a/src/wp-admin/network/user-new.php b/src/wp-admin/network/user-new.php index 0f3ad1f68f..04ef34a0a4 100644 --- a/src/wp-admin/network/user-new.php +++ b/src/wp-admin/network/user-new.php @@ -69,7 +69,6 @@ $parent_file = 'users.php'; require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

@@ -275,7 +273,6 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( } ?>
-

-

diff --git a/src/wp-admin/options-general.php b/src/wp-admin/options-general.php index 5f2bf21ce8..65353325f0 100644 --- a/src/wp-admin/options-general.php +++ b/src/wp-admin/options-general.php @@ -84,7 +84,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/options-media.php b/src/wp-admin/options-media.php index 4eccbf6a27..e0c06ca30d 100644 --- a/src/wp-admin/options-media.php +++ b/src/wp-admin/options-media.php @@ -40,7 +40,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php index 738a0c3f8f..63ddc551df 100644 --- a/src/wp-admin/options-permalink.php +++ b/src/wp-admin/options-permalink.php @@ -170,7 +170,6 @@ if ( ! is_multisite() ) {
-

diff --git a/src/wp-admin/options-reading.php b/src/wp-admin/options-reading.php index e928b2e3d8..72dfc8fdea 100644 --- a/src/wp-admin/options-reading.php +++ b/src/wp-admin/options-reading.php @@ -76,7 +76,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/options-writing.php b/src/wp-admin/options-writing.php index b3f9f68192..d6ba5d3239 100644 --- a/src/wp-admin/options-writing.php +++ b/src/wp-admin/options-writing.php @@ -62,7 +62,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/options.php b/src/wp-admin/options.php index 00fb3c0fe5..8b84811476 100644 --- a/src/wp-admin/options.php +++ b/src/wp-admin/options.php @@ -200,7 +200,6 @@ if ( 'update' == $action ) { include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/plugin-editor.php b/src/wp-admin/plugin-editor.php index 94925b4897..ff962b8b55 100644 --- a/src/wp-admin/plugin-editor.php +++ b/src/wp-admin/plugin-editor.php @@ -167,7 +167,6 @@ default:
-

diff --git a/src/wp-admin/plugin-install.php b/src/wp-admin/plugin-install.php index 2e89a0e697..8d0dde3269 100644 --- a/src/wp-admin/plugin-install.php +++ b/src/wp-admin/plugin-install.php @@ -73,7 +73,6 @@ get_current_screen()->set_help_sidebar( include(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

views(); ?> diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php index 6ae3b25267..776a2b54a7 100644 --- a/src/wp-admin/plugins.php +++ b/src/wp-admin/plugins.php @@ -116,7 +116,6 @@ if ( $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '
'; - screen_icon(); echo '

' . esc_html( $title ) . '

'; $url = self_admin_url('update.php?action=update-selected&plugins=' . urlencode( join(',', $plugins) )); @@ -259,7 +258,6 @@ if ( $action ) { } } } - screen_icon(); $plugins_to_delete = count( $plugin_info ); echo '

' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '

'; ?> @@ -408,7 +406,6 @@ if ( !empty($invalid) )
-

diff --git a/src/wp-admin/revision.php b/src/wp-admin/revision.php index 7d1ce8121e..818d13c2ff 100644 --- a/src/wp-admin/revision.php +++ b/src/wp-admin/revision.php @@ -124,7 +124,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

diff --git a/src/wp-admin/theme-editor.php b/src/wp-admin/theme-editor.php index 7d1c61897d..8d1775d4d6 100644 --- a/src/wp-admin/theme-editor.php +++ b/src/wp-admin/theme-editor.php @@ -133,7 +133,6 @@ if ( $description != $file_show ) $description .= ' (' . $file_show . ')'; ?>
-

diff --git a/src/wp-admin/theme-install.php b/src/wp-admin/theme-install.php index 4756445bfe..55d6de99c4 100644 --- a/src/wp-admin/theme-install.php +++ b/src/wp-admin/theme-install.php @@ -75,9 +75,6 @@ get_current_screen()->set_help_sidebar( include(ABSPATH . 'wp-admin/admin-header.php'); ?>
-

-

diff --git a/src/wp-admin/update-core.php b/src/wp-admin/update-core.php index e16fbdf636..6cdffc683d 100644 --- a/src/wp-admin/update-core.php +++ b/src/wp-admin/update-core.php @@ -376,7 +376,6 @@ function do_core_upgrade( $reinstall = false ) { ?>
-

-

'; - screen_icon('plugins'); echo '

' . esc_html__('Update Plugins') . '

'; echo ""; echo '
'; @@ -598,7 +595,6 @@ if ( 'upgrade-core' == $action ) { require_once(ABSPATH . 'wp-admin/admin-header.php'); echo '
'; - screen_icon('themes'); echo '

' . esc_html__('Update Themes') . '

'; echo ""; echo '
'; diff --git a/src/wp-admin/upload.php b/src/wp-admin/upload.php index 64d0f84676..df998098d0 100644 --- a/src/wp-admin/upload.php +++ b/src/wp-admin/upload.php @@ -177,7 +177,6 @@ require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
-

-

-

-

@@ -323,7 +322,6 @@ case 'remove':
-

    @@ -425,7 +423,6 @@ if ( ! empty($messages) ) { } ?>
    -

    -

    >

    @@ -310,7 +309,6 @@ $errors = array( require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
    -