<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26518] trunk/src/wp-admin: Remove all screen_icon() calls and deprecate the functions, props TobiasBg, fixes #26119</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26518">26518</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-02 03:52:23 +0000 (Mon, 02 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Remove all screen_icon() calls and deprecate the functions, props TobiasBg, fixes <a href="http://core.trac.wordpress.org/ticket/26119">#26119</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmincustomheaderphp">trunk/src/wp-admin/custom-header.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadmineditlinkformphp">trunk/src/wp-admin/edit-link-form.php</a></li>
<li><a href="#trunksrcwpadminedittagformphp">trunk/src/wp-admin/edit-tag-form.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderskinsphp">trunk/src/wp-admin/includes/class-wp-upgrader-skins.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminindexphp">trunk/src/wp-admin/index.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminmedianewphp">trunk/src/wp-admin/media-new.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmsdeletesitephp">trunk/src/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworkindexphp">trunk/src/wp-admin/network/index.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworkusernewphp">trunk/src/wp-admin/network/user-new.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionsmediaphp">trunk/src/wp-admin/options-media.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.php</a></li>
<li><a href="#trunksrcwpadminoptionswritingphp">trunk/src/wp-admin/options-writing.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminthemeinstallphp">trunk/src/wp-admin/theme-install.php</a></li>
<li><a href="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/comment.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/comment.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/comment.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -115,7 +115,6 @@
</span><span class="cx"> 
</span><span class="cx"> <div class="narrow">
</span><span class="cx"> 
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-background.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-background.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/custom-background.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -179,7 +179,6 @@
</span><span class="cx">  function admin_page() {
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap" id="custom-background">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e('Custom Background'); ?></h2>
</span><span class="cx"> <?php if ( !empty($this->updated) ) { ?>
</span><span class="cx"> <div id="message" class="updated">
</span></span></pre></div>
<a id="trunksrcwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/custom-header.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/custom-header.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/custom-header.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -450,7 +450,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e('Custom Header'); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( ! empty( $this->updated ) ) { ?>
</span><span class="lines">@@ -724,7 +723,6 @@
</span><span class="cx">          ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e( 'Crop Header Image' ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-comments.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-comments.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-comments.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -140,7 +140,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php
</span><span class="cx"> if ( $post_id )
</span><span class="cx">  echo sprintf( __( 'Comments on &#8220;%s&#8221;' ),
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-advanced.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-advanced.php        2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-form-advanced.php   2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -359,7 +359,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php
</span><span class="cx"> echo esc_html( $title );
</span><span class="cx"> if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-form-comment.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-form-comment.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-form-comment.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -13,7 +13,6 @@
</span><span class="cx"> <form name="post" action="comment.php" method="post" id="post">
</span><span class="cx"> <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e('Edit Comment'); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <div id="poststuff">
</span></span></pre></div>
<a id="trunksrcwpadmineditlinkformphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-link-form.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-link-form.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-link-form.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -70,7 +70,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?>  <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( isset( $_GET['added'] ) ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminedittagformphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-tag-form.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-tag-form.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-tag-form.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo $tax->labels->edit_item; ?></h2>
</span><span class="cx"> <div id="ajax-response"></div>
</span><span class="cx"> <form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"<?php do_action( $taxonomy . '_term_edit_form_tag' ); ?>>
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit-tags.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit-tags.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit-tags.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -301,7 +301,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap nosubsub">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title );
</span><span class="cx"> if ( !empty($_REQUEST['s']) )
</span><span class="cx">  printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/edit.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/edit.php      2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/edit.php 2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -265,7 +265,6 @@
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php
</span><span class="cx"> echo esc_html( $post_type_object->labels->name );
</span><span class="cx"> if ( current_user_can( $post_type_object->cap->create_posts ) )
</span></span></pre></div>
<a id="trunksrcwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/export.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/export.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/export.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -144,7 +144,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/import.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/import.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/import.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -52,7 +52,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> <?php if ( ! empty( $_GET['invalid'] ) ) : ?>
</span><span class="cx">  <div class="error"><p><strong><?php _e('ERROR:')?></strong> <?php printf( __('The <strong>%s</strong> importer is invalid or is not installed.'), esc_html( $_GET['invalid'] ) ); ?></p></div>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderskinsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/class-wp-upgrader-skins.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/class-wp-upgrader-skins.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/includes/class-wp-upgrader-skins.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -51,7 +51,6 @@
</span><span class="cx">                  return;
</span><span class="cx">          $this->done_header = true;
</span><span class="cx">          echo '<div class="wrap">';
</span><del>-               screen_icon();
</del><span class="cx">           echo '<h2>' . $this->options['title'] . '</h2>';
</span><span class="cx">  }
</span><span class="cx">  function footer() {
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/deprecated.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/deprecated.php       2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/includes/deprecated.php  2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -1134,3 +1134,54 @@
</span><span class="cx"> function the_attachment_links( $id = false ) {
</span><span class="cx">  _deprecated_function( __FUNCTION__, '3.7' );
</span><span class="cx"> }
</span><ins>+
+/**
+ * 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 '<div id="icon-' . esc_attr( $icon_id ) . '" class="' . $class . '"><br /></div>';
+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpadminincludesscreenphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/includes/screen.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/includes/screen.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/includes/screen.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -125,53 +125,6 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * 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 '<div id="icon-' . esc_attr( $icon_id ) . '" class="' . $class . '"><br /></div>';
-}
-
-/**
</del><span class="cx">  * Get the current screen object
</span><span class="cx">  *
</span><span class="cx">  * @since 3.1.0
</span></span></pre></div>
<a id="trunksrcwpadminindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/index.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/index.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/index.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -93,7 +93,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( has_action( 'welcome_panel' ) && current_user_can( 'edit_theme_options' ) ) :
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/link-manager.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/link-manager.php      2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/link-manager.php 2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap nosubsub">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?> <a href="link-add.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'link'); ?></a> <?php
</span><span class="cx"> if ( !empty($_REQUEST['s']) )
</span><span class="cx">  printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( wp_unslash($_REQUEST['s']) ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpadminmedianewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/media-new.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/media-new.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/media-new.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx">  $form_class .= ' html-uploader';
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx">  <form enctype="multipart/form-data" method="post" action="<?php echo admin_url('media-new.php'); ?>" class="<?php echo esc_attr( $form_class ); ?>" id="file-form">
</span></span></pre></div>
<a id="trunksrcwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/media.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/media.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/media.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -103,7 +103,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2>
</span><span class="cx"> <?php
</span><span class="cx"> echo esc_html( $title );
</span></span></pre></div>
<a id="trunksrcwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/ms-delete-site.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/ms-delete-site.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/ms-delete-site.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> 
</span><span class="cx"> echo '<div class="wrap">';
</span><del>-screen_icon();
</del><span class="cx"> echo '<h2>' . esc_html( $title ) . '</h2>';
</span><span class="cx"> 
</span><span class="cx"> if ( isset( $_POST['action'] ) && $_POST['action'] == 'deleteblog' && isset( $_POST['confirmdelete'] ) && $_POST['confirmdelete'] == '1' ) {
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/my-sites.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/my-sites.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/my-sites.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> if ( empty( $blogs ) ) :
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/nav-menus.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/nav-menus.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/nav-menus.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -533,7 +533,6 @@
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2 class="nav-tab-wrapper">
</span><span class="cx">          <a href="<?php echo admin_url( 'nav-menus.php' ); ?>" class="nav-tab<?php if ( ! isset( $_GET['action'] ) || isset( $_GET['action'] ) && 'locations' != $_GET['action'] ) echo ' nav-tab-active'; ?>"><?php esc_html_e( 'Edit Menus' ); ?></a>
</span><span class="cx">          <?php if ( $num_locations && $menu_count ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkindexphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/index.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/index.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/index.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <div id="dashboard-widgets-wrap">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/settings.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/settings.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/settings.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon('options-general'); ?>
</del><span class="cx">   <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">  <form method="post" action="settings.php">
</span><span class="cx">          <?php wp_nonce_field( 'siteoptions' ); ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-info.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-info.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/site-info.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -96,7 +96,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('ms-admin'); ?>
</del><span class="cx"> <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
</span><span class="cx"> <h3 class="nav-tab-wrapper">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-new.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-new.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/site-new.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -111,7 +111,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('ms-admin'); ?>
</del><span class="cx"> <h2 id="add-new-site"><?php _e('Add New Site') ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> if ( ! empty( $messages ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-settings.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-settings.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/site-settings.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -87,7 +87,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('ms-admin'); ?>
</del><span class="cx"> <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
</span><span class="cx"> <h3 class="nav-tab-wrapper">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-themes.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-themes.php       2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/site-themes.php  2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -135,7 +135,6 @@
</span><span class="cx"> require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('ms-admin'); ?>
</del><span class="cx"> <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
</span><span class="cx"> <h3 class="nav-tab-wrapper">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteusersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/site-users.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/site-users.php        2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/site-users.php   2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -184,7 +184,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('ms-admin'); ?>
</del><span class="cx"> <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
</span><span class="cx"> <h3 class="nav-tab-wrapper">
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/sites.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/sites.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/sites.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -231,7 +231,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon( 'ms-admin' ); ?>
</del><span class="cx"> <h2><?php _e( 'Sites' ) ?>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( current_user_can( 'create_sites') ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/themes.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/themes.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/themes.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -90,7 +90,6 @@
</span><span class="cx">                  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> 
</span><span class="cx">                  echo '<div class="wrap">';
</span><del>-                       screen_icon();
</del><span class="cx">                   echo '<h2>' . esc_html( $title ) . '</h2>';
</span><span class="cx"> 
</span><span class="cx">                  $url = self_admin_url('update.php?action=update-selected-themes&amp;themes=' . urlencode( join(',', $themes) ));
</span><span class="lines">@@ -137,7 +136,6 @@
</span><span class="cx">                  <div class="wrap">
</span><span class="cx">                          <?php
</span><span class="cx">                                  $themes_to_delete = count( $themes );
</span><del>-                                       screen_icon();
</del><span class="cx">                                   echo '<h2>' . _n( 'Delete Theme', 'Delete Themes', $themes_to_delete ) . '</h2>';
</span><span class="cx">                          ?>
</span><span class="cx">                          <div class="error"><p><strong><?php _e( 'Caution:' ); ?></strong> <?php echo _n( 'This theme may be active on other sites in the network.', 'These themes may be active on other sites in the network.', $themes_to_delete ); ?></p></div>
</span><span class="lines">@@ -227,7 +225,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('themes'); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
</span><span class="cx"> if ( $s )
</span><span class="cx">  printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/upgrade.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/upgrade.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/upgrade.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -39,7 +39,6 @@
</span><span class="cx">  wp_die( __( 'You do not have permission to access this page.' ) );
</span><span class="cx"> 
</span><span class="cx"> echo '<div class="wrap">';
</span><del>-screen_icon('tools');
</del><span class="cx"> echo '<h2>' . __( 'Upgrade Network' ) . '</h2>';
</span><span class="cx"> 
</span><span class="cx"> $action = isset($_GET['action']) ? $_GET['action'] : 'show';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/user-new.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/user-new.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/user-new.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -69,7 +69,6 @@
</span><span class="cx"> require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2 id="add-new-user"><?php _e('Add New User') ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> if ( ! empty( $messages ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network/users.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network/users.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network/users.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -20,8 +20,6 @@
</span><span class="cx">  $current_user = wp_get_current_user();
</span><span class="cx">  if ( !is_array( $users ) )
</span><span class="cx">          return false;
</span><del>-
-       screen_icon();
</del><span class="cx">   ?>
</span><span class="cx">  <h2><?php esc_html_e( 'Users' ); ?></h2>
</span><span class="cx">  <p><?php _e( 'Transfer or delete posts before deleting users.' ); ?></p>
</span><span class="lines">@@ -275,7 +273,6 @@
</span><span class="cx"> }
</span><span class="cx">  ?>
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2><?php esc_html_e( 'Users' );
</span><span class="cx">  if ( current_user_can( 'create_users') ) : ?>
</span><span class="cx">          <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
</span></span></pre></div>
<a id="trunksrcwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/network.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/network.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/network.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -136,7 +136,6 @@
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-header.php' );
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon('tools'); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-discussion.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-discussion.php        2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-discussion.php   2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form method="post" action="options.php">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-general.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-general.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-general.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -84,7 +84,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form method="post" action="options.php">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-media.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-media.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-media.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form action="options.php" method="post">
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-permalink.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-permalink.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-permalink.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -170,7 +170,6 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form name="form" action="options-permalink.php" method="post">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-reading.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-reading.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-reading.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -76,7 +76,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form method="post" action="options.php">
</span></span></pre></div>
<a id="trunksrcwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options-writing.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options-writing.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options-writing.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -62,7 +62,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <form method="post" action="options.php">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/options.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/options.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/options.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -200,7 +200,6 @@
</span><span class="cx"> include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx">   <h2><?php esc_html_e('All Settings'); ?></h2>
</span><span class="cx">   <form name="form" action="options.php" method="post" id="all-options">
</span><span class="cx">   <?php wp_nonce_field('options-options') ?>
</span></span></pre></div>
<a id="trunksrcwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/plugin-editor.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/plugin-editor.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/plugin-editor.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -167,7 +167,6 @@
</span><span class="cx"> </div>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <div class="fileedit-sub">
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/plugin-install.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/plugin-install.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/plugin-install.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> include(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon( 'plugins' ); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php $wp_list_table->views(); ?>
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/plugins.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/plugins.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/plugins.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -116,7 +116,6 @@
</span><span class="cx">                  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> 
</span><span class="cx">                  echo '<div class="wrap">';
</span><del>-                       screen_icon();
</del><span class="cx">                   echo '<h2>' . esc_html( $title ) . '</h2>';
</span><span class="cx"> 
</span><span class="cx">                  $url = self_admin_url('update.php?action=update-selected&amp;plugins=' . urlencode( join(',', $plugins) ));
</span><span class="lines">@@ -259,7 +258,6 @@
</span><span class="cx">                                                  }
</span><span class="cx">                                          }
</span><span class="cx">                                  }
</span><del>-                                       screen_icon();
</del><span class="cx">                                   $plugins_to_delete = count( $plugin_info );
</span><span class="cx">                                  echo '<h2>' . _n( 'Delete Plugin', 'Delete Plugins', $plugins_to_delete ) . '</h2>';
</span><span class="cx">                          ?>
</span><span class="lines">@@ -408,7 +406,6 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title );
</span><span class="cx"> if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
</span><span class="cx">  <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
</span></span></pre></div>
<a id="trunksrcwpadminrevisionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/revision.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/revision.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/revision.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -124,7 +124,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2 class="long-header"><?php echo $h2; ?></h2>
</span><span class="cx"> </div>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-editor.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-editor.php      2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/theme-editor.php 2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -133,7 +133,6 @@
</span><span class="cx">  $description .= ' <span>(' . $file_show . ')</span>';
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <div class="fileedit-sub">
</span></span></pre></div>
<a id="trunksrcwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/theme-install.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/theme-install.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/theme-install.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -75,9 +75,6 @@
</span><span class="cx"> include(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php
-screen_icon();
-?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcwpadmintoolsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/tools.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/tools.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/tools.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -33,7 +33,6 @@
</span><span class="cx"> 
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( current_user_can('edit_posts') ) : ?>
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/update-core.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/update-core.php       2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/update-core.php  2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -376,7 +376,6 @@
</span><span class="cx"> 
</span><span class="cx"> ?>
</span><span class="cx">  <div class="wrap">
</span><del>-       <?php screen_icon('tools'); ?>
</del><span class="cx">   <h2><?php _e('Update WordPress'); ?></h2>
</span><span class="cx"> <?php
</span><span class="cx"> 
</span><span class="lines">@@ -490,7 +489,6 @@
</span><span class="cx">  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">  ?>
</span><span class="cx">  <div class="wrap">
</span><del>-       <?php screen_icon('tools'); ?>
</del><span class="cx">   <h2><?php _e('WordPress Updates'); ?></h2>
</span><span class="cx">  <?php
</span><span class="cx">  if ( $upgrade_error ) {
</span><span class="lines">@@ -569,7 +567,6 @@
</span><span class="cx"> 
</span><span class="cx">  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">  echo '<div class="wrap">';
</span><del>-       screen_icon('plugins');
</del><span class="cx">   echo '<h2>' . esc_html__('Update Plugins') . '</h2>';
</span><span class="cx">  echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
</span><span class="cx">  echo '</div>';
</span><span class="lines">@@ -598,7 +595,6 @@
</span><span class="cx"> 
</span><span class="cx">  require_once(ABSPATH . 'wp-admin/admin-header.php');
</span><span class="cx">  echo '<div class="wrap">';
</span><del>-       screen_icon('themes');
</del><span class="cx">   echo '<h2>' . esc_html__('Update Themes') . '</h2>';
</span><span class="cx">  echo "<iframe src='$url' style='width: 100%; height: 100%; min-height: 750px;' frameborder='0'></iframe>";
</span><span class="cx">  echo '</div>';
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/upload.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/upload.php    2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/upload.php       2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -177,7 +177,6 @@
</span><span class="cx"> ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2>
</span><span class="cx"> <?php
</span><span class="cx"> echo esc_html( $title );
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/user-edit.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/user-edit.php 2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/user-edit.php    2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -210,7 +210,6 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap" id="profile-page">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2>
</span><span class="cx"> <?php
</span><span class="cx"> echo esc_html( $title );
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/user-new.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/user-new.php  2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/user-new.php     2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -233,7 +233,6 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2 id="add-new-user"> <?php
</span><span class="cx"> if ( current_user_can( 'create_users' ) ) {
</span><span class="cx">  echo _x( 'Add New User', 'user' );
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/users.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/users.php     2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/users.php        2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -218,7 +218,6 @@
</span><span class="cx"> <?php echo $referer; ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e('Delete Users'); ?></h2>
</span><span class="cx"> <?php if ( isset( $_REQUEST['error'] ) ) : ?>
</span><span class="cx"> <div class="error">
</span><span class="lines">@@ -323,7 +322,6 @@
</span><span class="cx"> <?php echo $referer; ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php _e('Remove Users from Site'); ?></h2>
</span><span class="cx"> <p><?php _e('You have specified these users for removal:'); ?></p>
</span><span class="cx"> <ul>
</span><span class="lines">@@ -425,7 +423,6 @@
</span><span class="cx"> } ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2>
</span><span class="cx"> <?php
</span><span class="cx"> echo esc_html( $title );
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/widgets.php (26517 => 26518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/widgets.php   2013-12-02 03:22:03 UTC (rev 26517)
+++ trunk/src/wp-admin/widgets.php      2013-12-02 03:52:23 UTC (rev 26518)
</span><span class="lines">@@ -229,7 +229,6 @@
</span><span class="cx"> 
</span><span class="cx">  require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx">  <div class="wrap">
</span><del>-       <?php screen_icon(); ?>
</del><span class="cx">   <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx">  <div class="editwidget"<?php echo $width; ?>>
</span><span class="cx">  <h3><?php printf( __( 'Widget %s' ), $name ); ?></h3>
</span><span class="lines">@@ -310,7 +309,6 @@
</span><span class="cx"> require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
</span><span class="cx"> 
</span><span class="cx"> <div class="wrap">
</span><del>-<?php screen_icon(); ?>
</del><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><span class="cx"> 
</span><span class="cx"> <?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
</span></span></pre>
</div>
</div>

</body>
</html>