From 6da93732e770f18493ca260cea7bbdd875b2ec55 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Aug 2019 02:03:55 +0000 Subject: [PATCH] Docs: Add missing description for `$current_screen` global. Props mukesh27. Fixes #45604. See #47110. Built from https://develop.svn.wordpress.org/trunk@45740 git-svn-id: http://core.svn.wordpress.org/trunk@45551 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/admin-header.php | 2 +- wp-admin/includes/class-wp-screen.php | 2 +- wp-admin/includes/screen.php | 2 +- wp-includes/load.php | 8 ++++---- wp-includes/script-loader.php | 4 ++-- wp-includes/version.php | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 6d5718a4be..bc66618727 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -16,7 +16,7 @@ if ( ! defined( 'WP_ADMIN' ) ) { * * @global string $title * @global string $hook_suffix - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * @global WP_Locale $wp_locale WordPress date and time locale object. * @global string $pagenow * @global string $update_title diff --git a/wp-admin/includes/class-wp-screen.php b/wp-admin/includes/class-wp-screen.php index 496fe71e23..c6f47a5179 100644 --- a/wp-admin/includes/class-wp-screen.php +++ b/wp-admin/includes/class-wp-screen.php @@ -392,7 +392,7 @@ final class WP_Screen { * @see set_current_screen() * @since 3.3.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * @global string $taxnow * @global string $typenow */ diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php index 8860c0d12b..61c4b6abd8 100644 --- a/wp-admin/includes/screen.php +++ b/wp-admin/includes/screen.php @@ -215,7 +215,7 @@ function add_screen_option( $option, $args = array() ) { * * @since 3.1.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * * @return WP_Screen|null Current screen object or null when screen not defined. */ diff --git a/wp-includes/load.php b/wp-includes/load.php index 57fd841703..86aebead6c 100644 --- a/wp-includes/load.php +++ b/wp-includes/load.php @@ -985,7 +985,7 @@ function wp_clone( $object ) { * * @since 1.5.1 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * * @return bool True if inside WordPress administration interface, false otherwise. */ @@ -1009,7 +1009,7 @@ function is_admin() { * * @since 3.1.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * * @return bool True if inside WordPress blog administration pages. */ @@ -1036,7 +1036,7 @@ function is_blog_admin() { * * @since 3.1.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * * @return bool True if inside WordPress network administration pages. */ @@ -1060,7 +1060,7 @@ function is_network_admin() { * * @since 3.1.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. * * @return bool True if inside WordPress user administration pages. */ diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index 720c2c9ced..c06680c678 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -2708,7 +2708,7 @@ function script_concat_settings() { * * @since 5.0.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. */ function wp_common_block_scripts_and_styles() { global $current_screen; @@ -2742,7 +2742,7 @@ function wp_common_block_scripts_and_styles() { * * @since 5.0.0 * - * @global WP_Screen $current_screen + * @global WP_Screen $current_screen WordPress current screen object. */ function wp_enqueue_registered_block_scripts_and_styles() { global $current_screen; diff --git a/wp-includes/version.php b/wp-includes/version.php index 700d9c08db..a940c66895 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.3-alpha-45739'; +$wp_version = '5.3-alpha-45740'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.