From 11d6f0712e42214181c72d64fcba0899a9fbe111 Mon Sep 17 00:00:00 2001
From: Drew Jaynes <info@drewapicture.com>
Date: Mon, 23 May 2016 16:34:28 +0000
Subject: [PATCH] Docs: Update the return notation for `get_current_screen()`
 to note that `null` can also be returned if the screen has not been defined.

Props screamingdev.
Fixes #36382.

Built from https://develop.svn.wordpress.org/trunk@37534


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

diff --git a/wp-admin/includes/screen.php b/wp-admin/includes/screen.php
index 0bbffc04f7..3c6a5131b9 100644
--- a/wp-admin/includes/screen.php
+++ b/wp-admin/includes/screen.php
@@ -200,7 +200,7 @@ function add_screen_option( $option, $args = array() ) {
  *
  * @global WP_Screen $current_screen
  *
- * @return WP_Screen Current screen object
+ * @return WP_Screen|null Current screen object or null when screen not defined.
  */
 function get_current_screen() {
 	global $current_screen;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b2d8c9d717..ca52b25d8f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37533';
+$wp_version = '4.6-alpha-37534';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.