From 4ce9b93af9c6be6b5f5ba8b8b3e5a1ca24ba3d3f Mon Sep 17 00:00:00 2001
From: Boone Gorges <boonebgorges@gmail.com>
Date: Sat, 9 Jan 2016 03:12:26 +0000
Subject: [PATCH] Clarify return types in `get_option()` documentation.

The new note specifies that scalar values will always be returned as strings.

Fixes #31820.
Built from https://develop.svn.wordpress.org/trunk@36234


git-svn-id: http://core.svn.wordpress.org/trunk@36201 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/option.php  | 3 +++
 wp-includes/version.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/wp-includes/option.php b/wp-includes/option.php
index 6d9fe645c6..842981dd48 100644
--- a/wp-includes/option.php
+++ b/wp-includes/option.php
@@ -16,6 +16,9 @@
  *
  * If the option was serialized then it will be unserialized when it is returned.
  *
+ * Any scalar values will be returned as strings. You may coerce the return type of a given option by registering a
+ * 'option_{$option}' filter callback.
+ *
  * @since 1.5.0
  *
  * @global wpdb $wpdb WordPress database abstraction object.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 85e772b77b..73ce5e2a55 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.5-alpha-36233';
+$wp_version = '4.5-alpha-36234';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.