From e14b61ca8ae849e1f3b03e9ab600453b0b06d653 Mon Sep 17 00:00:00 2001
From: jrfnl <jrfnl@users.noreply.github.com>
Date: Thu, 18 Jul 2019 03:02:16 +0200
Subject: [PATCH] Simplify & modernize wp_iframe()

---
 src/wp-admin/includes/media.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/wp-admin/includes/media.php b/src/wp-admin/includes/media.php
index d6a2116bb8..aa226474c4 100644
--- a/src/wp-admin/includes/media.php
+++ b/src/wp-admin/includes/media.php
@@ -491,7 +491,7 @@ function media_handle_sideload( $file_array, $post_id, $desc = null, $post_data
  * @param callable $content_func Function that outputs the content.
  * @param mixed    ...$args      Optional additional parameters to pass to the callback function when it's called.
  */
-function wp_iframe( $content_func ) {
+function wp_iframe( $content_func, ...$args ) {
 	_wp_admin_html_begin();
 	?>
 <title><?php bloginfo( 'name' ); ?> &rsaquo; <?php _e( 'Uploads' ); ?> &#8212; <?php _e( 'WordPress' ); ?></title>
@@ -571,8 +571,6 @@ isRtl = <?php echo (int) is_rtl(); ?>;
 document.body.className = document.body.className.replace('no-js', 'js');
 </script>
 	<?php
-	$args = func_get_args();
-	$args = array_slice( $args, 1 );
 	call_user_func_array( $content_func, $args );
 
 	/** This action is documented in wp-admin/admin-footer.php */
-- 
2.21.0.windows.1