From 5241f4c2dde88eca2226e12673171d17485b4da6 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Fri, 4 Oct 2019 23:20:58 +0000
Subject: [PATCH] Themes: Bring default values for `get_theme_root()`,
 `get_theme_root_uri()`, `wp_get_theme()`, and `wp_customize_url()` in line
 with the documentation.

Reverts [46327].

Fixes #44397.
Built from https://develop.svn.wordpress.org/trunk@46392


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

diff --git a/wp-includes/theme.php b/wp-includes/theme.php
index 3f634985f9..302c27fd87 100644
--- a/wp-includes/theme.php
+++ b/wp-includes/theme.php
@@ -107,7 +107,7 @@ function wp_get_themes( $args = array() ) {
  *                           is used to calculate the theme root for the $stylesheet provided (or current theme).
  * @return WP_Theme Theme object. Be sure to check the object's exists() method if you need to confirm the theme's existence.
  */
-function wp_get_theme( $stylesheet = null, $theme_root = null ) {
+function wp_get_theme( $stylesheet = '', $theme_root = '' ) {
 	global $wp_theme_directories;
 
 	if ( empty( $stylesheet ) ) {
@@ -566,10 +566,11 @@ function search_theme_directories( $force = false ) {
  *
  * @global array $wp_theme_directories
  *
- * @param string $stylesheet_or_template The stylesheet or template name of the theme
- * @return string Theme path.
+ * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
+ *                                       Default is to leverage the main theme root.
+ * @return string Themes directory path.
  */
-function get_theme_root( $stylesheet_or_template = false ) {
+function get_theme_root( $stylesheet_or_template = '' ) {
 	global $wp_theme_directories;
 
 	$theme_root = '';
@@ -608,13 +609,13 @@ function get_theme_root( $stylesheet_or_template = false ) {
  *
  * @global array $wp_theme_directories
  *
- * @param bool|string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
- *                                            Default value false, to use the main theme root.
- * @param bool|string $theme_root             Optional. The theme root for which calculations will be based, preventing
- *                                            the need for a get_raw_theme_root() call. Default value false.
- * @return string Themes URI.
+ * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
+ *                                       Default is to leverage the main theme root.
+ * @param string $theme_root             Optional. The theme root for which calculations will be based,
+ *                                       preventing the need for a get_raw_theme_root() call. Default empty.
+ * @return string Themes directory URI.
  */
-function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
+function get_theme_root_uri( $stylesheet_or_template = '', $theme_root = '' ) {
 	global $wp_theme_directories;
 
 	if ( $stylesheet_or_template && ! $theme_root ) {
@@ -647,7 +648,7 @@ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = fals
 	 *
 	 * @param string $theme_root_uri         The URI for themes directory.
 	 * @param string $siteurl                WordPress web address which is set in General Options.
-	 * @param string $stylesheet_or_template Stylesheet or template name of the theme.
+	 * @param string $stylesheet_or_template The stylesheet or template name of the theme.
 	 */
 	return apply_filters( 'theme_root_uri', $theme_root_uri, get_option( 'siteurl' ), $stylesheet_or_template );
 }
@@ -659,10 +660,10 @@ function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = fals
  *
  * @global array $wp_theme_directories
  *
- * @param string $stylesheet_or_template The stylesheet or template name of the theme
+ * @param string $stylesheet_or_template The stylesheet or template name of the theme.
  * @param bool   $skip_cache             Optional. Whether to skip the cache.
  *                                       Defaults to false, meaning the cache is used.
- * @return string Theme root
+ * @return string Theme root.
  */
 function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
 	global $wp_theme_directories;
@@ -3180,7 +3181,7 @@ function _wp_customize_loader_settings() {
  *                           The theme's stylesheet will be urlencoded if necessary.
  * @return string
  */
-function wp_customize_url( $stylesheet = null ) {
+function wp_customize_url( $stylesheet = '' ) {
 	$url = admin_url( 'customize.php' );
 	if ( $stylesheet ) {
 		$url .= '?theme=' . urlencode( $stylesheet );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4a887a63e2..1e2de03ad5 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.3-beta2-46391';
+$wp_version = '5.3-beta2-46392';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.