From 5a0b01edf16fdad931433946ec8715fb19f3dad6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 13 Feb 2015 05:31:26 +0000
Subject: [PATCH] Rename unused argument and remove obsolete global in
 `iframe_header()`.

props ipm-frommen.
fixes #31309.
Built from https://develop.svn.wordpress.org/trunk@31443


git-svn-id: http://core.svn.wordpress.org/trunk@31424 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/template.php | 8 ++++----
 wp-includes/version.php        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index 30e333ec5e..ca6fe17e64 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -250,7 +250,7 @@ function wp_terms_checklist( $post_id = 0, $args = array() ) {
  * @since 2.5.0
  *
  * @param string $taxonomy Taxonomy to retrieve terms from.
- * @param int $default Unused.
+ * @param int $default Not used.
  * @param int $number Number of terms to retrieve. Defaults to 10.
  * @param bool $echo Optionally output the list as well. Defaults to true.
  * @return array List of popular term IDs.
@@ -1527,12 +1527,12 @@ function _admin_search_query() {
  *
  * @since 2.7.0
  * @param string $title Title of the Iframe page.
- * @param bool $limit_styles Limit styles to colour-related styles only (unless others are enqueued).
+ * @param bool $deprecated Not used.
  *
  */
-function iframe_header( $title = '', $limit_styles = false ) {
+function iframe_header( $title = '', $deprecated = false ) {
 	show_admin_bar( false );
-	global $hook_suffix, $current_user, $admin_body_class, $wp_locale;
+	global $hook_suffix, $admin_body_class, $wp_locale;
 	$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
 
 	$current_screen = get_current_screen();
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 77e4521f71..f73767070d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31442';
+$wp_version = '4.2-alpha-31443';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.