IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Themes: Bring default values for get_theme_root(), get_theme_root_uri(), wp_get_theme(), and wp_customize_url() in line with the documentation.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2019-10-04 23:20:58 +00:00
parent d2a48496d2
commit 5241f4c2dd
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wp-includes/theme.php
View File

@ -107,7 +107,7 @@ function wp_get_themes( $args = array() ) {
* is used to calculate the theme root for the $stylesheet provided (or current theme). * 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. * @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; global $wp_theme_directories;
if ( empty( $stylesheet ) ) { if ( empty( $stylesheet ) ) {
@ -566,10 +566,11 @@ function search_theme_directories( $force = false ) {
* *
* @global array $wp_theme_directories * @global array $wp_theme_directories
* *
* @param string $stylesheet_or_template The stylesheet or template name of the theme * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
* @return string Theme path. * 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; global $wp_theme_directories;
$theme_root = ''; $theme_root = '';
@ -608,13 +609,13 @@ function get_theme_root( $stylesheet_or_template = false ) {
* *
* @global array $wp_theme_directories * @global array $wp_theme_directories
* *
* @param bool|string $stylesheet_or_template Optional. The stylesheet or template name of the theme. * @param string $stylesheet_or_template Optional. The stylesheet or template name of the theme.
* Default value false, to use the main theme root. * Default is to leverage the main theme root.
* @param bool|string $theme_root Optional. The theme root for which calculations will be based, preventing * @param string $theme_root Optional. The theme root for which calculations will be based,
* the need for a get_raw_theme_root() call. Default value false. * preventing the need for a get_raw_theme_root() call. Default empty.
* @return string Themes URI. * @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; global $wp_theme_directories;
if ( $stylesheet_or_template && ! $theme_root ) { 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 $theme_root_uri The URI for themes directory.
* @param string $siteurl WordPress web address which is set in General Options. * @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 ); 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 * @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. * @param bool $skip_cache Optional. Whether to skip the cache.
* Defaults to false, meaning the cache is used. * 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 ) { function get_raw_theme_root( $stylesheet_or_template, $skip_cache = false ) {
global $wp_theme_directories; global $wp_theme_directories;
@ -3180,7 +3181,7 @@ function _wp_customize_loader_settings() {
* The theme's stylesheet will be urlencoded if necessary. * The theme's stylesheet will be urlencoded if necessary.
* @return string * @return string
*/ */
function wp_customize_url( $stylesheet = null ) { function wp_customize_url( $stylesheet = '' ) {
$url = admin_url( 'customize.php' ); $url = admin_url( 'customize.php' );
if ( $stylesheet ) { if ( $stylesheet ) {
$url .= '?theme=' . urlencode( $stylesheet ); $url .= '?theme=' . urlencode( $stylesheet );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @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. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.