WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Sergey Biryukov 2016-09-04 04:09:28 +00:00
parent f0bb2bc3c0
commit 2bb27252f9
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/functions.wp-scripts.php
View File

@ -252,6 +252,7 @@ function wp_deregister_script( $handle ) {
* *
* @param string $handle Name of the script. Should be unique. * @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. * @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 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 * @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 * 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 </body> instead of in the <head>. * @param bool $in_footer Optional. Whether to enqueue the script before </body> instead of in the <head>.
* Default 'false'. * 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 = wp_scripts();
_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ ); _wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );

3
wp-includes/functions.wp-styles.php
View File

@ -151,6 +151,7 @@ function wp_deregister_style( $handle ) {
* *
* @param string $handle Name of the stylesheet. Should be unique. * @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. * @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 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 * @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 * 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 * Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like
* '(orientation: portrait)' and '(max-width: 640px)'. * '(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_scripts_maybe_doing_it_wrong( __FUNCTION__ );
$wp_styles = wp_styles(); $wp_styles = wp_styles();

2
wp-includes/version.php
View File

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