Changeset 46392

Timestamp:

10/04/2019 11:20:01 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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.

File:

• trunk/src/wp-includes/theme.php (modified) (6 diffs)

trunk/src/wp-includes/theme.php

@@ -108 +108 @@
  * @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;
 
@@ -567 +567 @@
  * @global array $wp_theme_directories
  *
- * @param string $stylesheet_or_template The stylesheet or template name of the theme
- * @return string Theme path.
- */
-function get_theme_root( $stylesheet_or_template = false ) {
+ * @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 = '' ) {
     global $wp_theme_directories;
 
@@ -609 +610 @@
  * @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.
- */
-function get_theme_root_uri( $stylesheet_or_template = false, $theme_root = false ) {
+ * @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 = '', $theme_root = '' ) {
     global $wp_theme_directories;
 
@@ -648 +649 @@
      * @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 );
@@ -660 +661 @@
  * @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 ) {
@@ -3181 +3182 @@
  * @return string
  */
-function wp_customize_url( $stylesheet = null ) {
+function wp_customize_url( $stylesheet = '' ) {
     $url = admin_url( 'customize.php' );
     if ( $stylesheet ) {