sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

git-svn-id: https://develop.svn.wordpress.org/trunk@46138 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Sergey Biryukov 2019-09-15 11:40:08 +00:00
parent 751f69be42
commit fd05ea0de9
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/wp-admin/includes/widgets.php
View File

@ -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';

28
tests/phpunit/tests/widgets.php
View File

@ -620,21 +620,20 @@ class Tests_Widgets extends WP_UnitTestCase {
wp_widgets_init();
require_once ABSPATH . '/wp-admin/includes/widgets.php';
$widget_id = 'search-2';
$widget = $wp_registered_widgets[ $widget_id ];
$params = array(
$widget_id = 'search-2';
$widget = $wp_registered_widgets[ $widget_id ];
$params = array(
'widget_id' => $widget['id'],
'widget_name' => $widget['name'],
);
$args = wp_list_widget_controls_dynamic_sidebar(
array(
0 => $params,
1 => $widget['params'][0],
)
$control_args = array(
0 => $params,
1 => $widget['params'][0],
);
$sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
ob_start();
call_user_func_array( 'wp_widget_control', $args );
wp_widget_control( ...$sidebar_args );
$control = ob_get_clean();
$this->assertNotEmpty( $control );
@ -659,15 +658,14 @@ class Tests_Widgets extends WP_UnitTestCase {
'after_widget_content' => '<!-- after_widget_content -->',
);
$params = array_merge( $params, $param_overrides );
$args = wp_list_widget_controls_dynamic_sidebar(
array(
0 => $params,
1 => $widget['params'][0],
)
$control_args = array(
0 => $params,
1 => $widget['params'][0],
);
$sidebar_args = wp_list_widget_controls_dynamic_sidebar( $control_args );
ob_start();
call_user_func_array( 'wp_widget_control', $args );
wp_widget_control( ...$sidebar_args );
$control = ob_get_clean();
$this->assertNotEmpty( $control );
$this->assertNotContains( '<form method="post">', $control );