From 2043081e9ea440ab135b261cb106d2c6806bae84 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Fri, 9 Dec 2022 12:25:14 +0000 Subject: [PATCH] Docs: Add missing type for `$_wp_theme_features` in `WP_Debug_Data::debug_data()`. Includes moving the global declaration to the top of the method for consistency. Follow-up to [44986], [54953]. See #57069, #56792. Built from https://develop.svn.wordpress.org/trunk@54954 git-svn-id: http://core.svn.wordpress.org/trunk@54506 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-debug-data.php | 7 +++---- wp-includes/version.php | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php index be7dc0fe88..5c3034ce39 100644 --- a/wp-admin/includes/class-wp-debug-data.php +++ b/wp-admin/includes/class-wp-debug-data.php @@ -29,13 +29,13 @@ class WP_Debug_Data { * @since 5.5.0 Added pretty permalinks support information. * * @throws ImagickException - * @global wpdb $wpdb WordPress database abstraction object. - * @global $_wp_theme_features + * @global wpdb $wpdb WordPress database abstraction object. + * @global array $_wp_theme_features * * @return array The debug data for the site. */ public static function debug_data() { - global $wpdb; + global $wpdb, $_wp_theme_features; // Save few function calls. $upload_dir = wp_upload_dir(); @@ -1065,7 +1065,6 @@ class WP_Debug_Data { } // Populate the section for the currently active theme. - global $_wp_theme_features; $theme_features = array(); if ( ! empty( $_wp_theme_features ) ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 04af729d98..670c388b90 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.2-alpha-54953'; +$wp_version = '6.2-alpha-54954'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.