From 2bb27252f91e3faaf18540a25837d1cc2b615b11 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sun, 4 Sep 2016 04:09:28 +0000 Subject: [PATCH] Script Loader: Correct default value for `$src` in `wp_enqueue_script()` and `wp_enqueue_style()`. Props Frank Klein for initial patch. See #37770. Built from https://develop.svn.wordpress.org/trunk@38519 git-svn-id: http://core.svn.wordpress.org/trunk@38460 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.wp-scripts.php | 3 ++- wp-includes/functions.wp-styles.php | 3 ++- wp-includes/version.php | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php index 315d69f8d0..cec5ca9d65 100644 --- a/wp-includes/functions.wp-scripts.php +++ b/wp-includes/functions.wp-scripts.php @@ -252,6 +252,7 @@ function wp_deregister_script( $handle ) { * * @param string $handle Name of the script. Should be unique. * @param string $src Full URL of the script, or path of the script relative to the WordPress root directory. + * Default empty. * @param array $deps Optional. An array of registered script handles this script depends on. Default empty array. * @param string|bool|null $ver Optional. String specifying script version number, if it has one, which is added to the URL * as a query string for cache busting purposes. If version is set to false, a version @@ -260,7 +261,7 @@ function wp_deregister_script( $handle ) { * @param bool $in_footer Optional. Whether to enqueue the script before instead of in the . * Default 'false'. */ -function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) { +function wp_enqueue_script( $handle, $src = '', $deps = array(), $ver = false, $in_footer = false ) { $wp_scripts = wp_scripts(); _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); diff --git a/wp-includes/functions.wp-styles.php b/wp-includes/functions.wp-styles.php index 5312f82330..db2603a938 100644 --- a/wp-includes/functions.wp-styles.php +++ b/wp-includes/functions.wp-styles.php @@ -151,6 +151,7 @@ function wp_deregister_style( $handle ) { * * @param string $handle Name of the stylesheet. Should be unique. * @param string $src Full URL of the stylesheet, or path of the stylesheet relative to the WordPress root directory. + * Default empty. * @param array $deps Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array. * @param string|bool|null $ver Optional. String specifying stylesheet version number, if it has one, which is added to the URL * as a query string for cache busting purposes. If version is set to false, a version @@ -160,7 +161,7 @@ function wp_deregister_style( $handle ) { * Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like * '(orientation: portrait)' and '(max-width: 640px)'. */ -function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) { +function wp_enqueue_style( $handle, $src = '', $deps = array(), $ver = false, $media = 'all' ) { _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); $wp_styles = wp_styles(); diff --git a/wp-includes/version.php b/wp-includes/version.php index a84cc791d3..50855383a0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.7-alpha-38518'; +$wp_version = '4.7-alpha-38519'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.