Ticket #2538: 2538.diff

includes/admin/settings.php

@@ -1244 +1244 @@
  *
  * @since bbPress (r2643)
  *
- * @uses screen_icon() To display the screen icon
  * @uses settings_fields() To output the hidden fields for the form
  * @uses do_settings_sections() To output the settings sections
  */
@@ -1253 +1252 @@
 
         <div class="wrap">
 
-                <?php screen_icon(); ?>
-
                 <h2><?php esc_html_e( 'Forums Settings', 'bbpress' ) ?></h2>
 
                 <form action="options.php" method="post">
@@ -1495 +1492 @@
 /**
  * The main settings page
  *
- * @uses screen_icon() To display the screen icon
  * @uses settings_fields() To output the hidden fields for the form
  * @uses do_settings_sections() To output the settings sections
  */
@@ -1504 +1500 @@
 
         <div class="wrap">
 
-                <?php screen_icon( 'tools' ); ?>
-
                 <h2 class="nav-tab-wrapper"><?php bbp_tools_admin_tabs( esc_html__( 'Import Forums', 'bbpress' ) ); ?></h2>
 
                 <form action="#" method="post" id="bbp-converter-settings">

includes/admin/tools.php

@@ -21 +21 @@
  * @uses check_admin_referer() To verify the nonce and the referer
  * @uses wp_cache_flush() To flush the cache
  * @uses do_action() Calls 'admin_notices' to display the notices
- * @uses screen_icon() To display the screen icon
  * @uses wp_nonce_field() To add a hidden nonce field
  */
 function bbp_admin_repair() {
@@ -29 +28 @@
 
         <div class="wrap">
 
-                <?php screen_icon( 'tools' ); ?>
-
                 <h2 class="nav-tab-wrapper"><?php bbp_tools_admin_tabs( __( 'Repair Forums', 'bbpress' ) ); ?></h2>
 
                 <p><?php esc_html_e( 'bbPress keeps track of relationships between forums, topics, replies, and topic tags, and users. Occasionally these relationships become out of sync, most often after an import or migration. Use the tools below to manually recalculate these relationships.', 'bbpress' ); ?></p>
@@ -1168 +1165 @@
  *
  * @uses check_admin_referer() To verify the nonce and the referer
  * @uses do_action() Calls 'admin_notices' to display the notices
- * @uses screen_icon() To display the screen icon
  * @uses wp_nonce_field() To add a hidden nonce field
  */
 function bbp_admin_reset() {
@@ -1176 +1172 @@
 
         <div class="wrap">
 
-                <?php screen_icon( 'tools' ); ?>
-
                 <h2 class="nav-tab-wrapper"><?php bbp_tools_admin_tabs( __( 'Reset Forums', 'bbpress' ) ); ?></h2>
                 <p><?php esc_html_e( 'Revert your forums back to a brand new installation. This process cannot be undone.', 'bbpress' ); ?></p>
                 <p><strong><?php esc_html_e( 'Backup your database before proceeding.', 'bbpress' ); ?></strong></p>