From 8ee37908515dfd6a41c3e1d1108eaa88a8fe5fe5 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Sun, 15 Sep 2019 11:41:55 +0000
Subject: [PATCH] Code Modernisation: Replace `call_user_func_array()` in
 `wp-admin/includes/widgets.php` and associated unit tests with a direct
 function call.

Props jrf.
See #47678.
Built from https://develop.svn.wordpress.org/trunk@46138


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

diff --git a/wp-admin/includes/widgets.php b/wp-admin/includes/widgets.php
index 6eae360c30..9f7dfb573f 100644
--- a/wp-admin/includes/widgets.php
+++ b/wp-admin/includes/widgets.php
@@ -51,13 +51,13 @@ function wp_list_widgets() {
 			}
 		}
 
-		$args = wp_list_widget_controls_dynamic_sidebar(
-			array(
-				0 => $args,
-				1 => $widget['params'][0],
-			)
+		$control_args = array(
+			0 => $args,
+			1 => $widget['params'][0],
 		);
-		call_user_func_array( 'wp_widget_control', $args );
+		$sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
+
+		wp_widget_control( ...$sidebar_args );
 	}
 }
 
@@ -144,6 +144,7 @@ function wp_list_widget_controls_dynamic_sidebar( $params ) {
 	$params[0]['after_widget']  = '</div>';
 	$params[0]['before_title']  = '%BEG_OF_TITLE%'; // deprecated
 	$params[0]['after_title']   = '%END_OF_TITLE%'; // deprecated
+
 	if ( is_callable( $wp_registered_widgets[ $widget_id ]['callback'] ) ) {
 		$wp_registered_widgets[ $widget_id ]['_callback'] = $wp_registered_widgets[ $widget_id ]['callback'];
 		$wp_registered_widgets[ $widget_id ]['callback']  = 'wp_widget_control';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index aefbadde2f..09e2c14da8 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-alpha-46137';
+$wp_version = '5.3-alpha-46138';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.