From e4fbdea3546f0e86eedf4f451c82fdcf61a9fe42 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 7 May 2022 17:14:20 +0000 Subject: [PATCH] Code Modernization: Rename parameters that use reserved keywords in `wp-admin/includes/template.php`. While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names. This commit renames the `$parent` parameter to `$parent_page` in `parent_dropdown()`. Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117], [53137], [53174], [53184], [53185], [53192], [53193], [53198], [53203], [53207], [53215], [53216], [53220], [53230], [53232], [53236], [53239], [53240], [53242], [53243], [53245], [53246], [53257], [53269], [53270], [53271], [53272], [53273], [53274], [53275], [53276], [53277], [53281], [53283], [53284], [53285], [53287]. Props jrf, aristath, poena, justinahinon, SergeyBiryukov. See #55650. git-svn-id: https://develop.svn.wordpress.org/trunk@53364 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/includes/template.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/wp-admin/includes/template.php b/src/wp-admin/includes/template.php index cb8000297a..b367264435 100644 --- a/src/wp-admin/includes/template.php +++ b/src/wp-admin/includes/template.php @@ -899,16 +899,24 @@ function page_template_dropdown( $default_template = '', $post_type = 'page' ) { * @global wpdb $wpdb WordPress database abstraction object. * * @param int $default_page Optional. The default page ID to be pre-selected. Default 0. - * @param int $parent Optional. The parent page ID. Default 0. + * @param int $parent_page Optional. The parent page ID. Default 0. * @param int $level Optional. Page depth level. Default 0. * @param int|WP_Post $post Post ID or WP_Post object. * @return void|false Void on success, false if the page has no children. */ -function parent_dropdown( $default_page = 0, $parent = 0, $level = 0, $post = null ) { +function parent_dropdown( $default_page = 0, $parent_page = 0, $level = 0, $post = null ) { global $wpdb; $post = get_post( $post ); - $items = $wpdb->get_results( $wpdb->prepare( "SELECT ID, post_parent, post_title FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'page' ORDER BY menu_order", $parent ) ); + $items = $wpdb->get_results( + $wpdb->prepare( + "SELECT ID, post_parent, post_title + FROM $wpdb->posts + WHERE post_parent = %d AND post_type = 'page' + ORDER BY menu_order", + $parent_page + ) + ); if ( $items ) { foreach ( $items as $item ) {