Ticket #15377: 15377.003.diff

wp-admin/includes/template.php

@@ -1918 +1918 @@
         return $return;
 }
 
-function screen_icon($screen = '') {
+function screen_icon( $screen = '' ) {
+        echo get_screen_icon( $screen );
+}
+
+function get_screen_icon( $screen = '' ) {
         global $current_screen, $typenow;
 
         if ( empty($screen) )
@@ -1946 +1950 @@
                         $class .= ' ' . sanitize_html_class( 'icon32-posts-' . $post_type );
         }
 
-?>
-        <div id="icon-<?php echo $name; ?>" class="<?php echo $class; ?>"><br /></div>
-<?php
+        return '<div id="icon-' . esc_attr( $name ) . '" class="' . $class . '"><br /></div>';
 }
 
 /**
@@ -2185 +2187 @@
 
         return $button;
 }
-