From 4303322ed1e210ede0a1735c09c25ca58bb72e01 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Sun, 5 Apr 2015 15:55:25 +0000 Subject: [PATCH] Add a variety of missing descriptions and fix syntax for `wp_scripts()`, `_wp_scripts_maybe_doing_it_wrong()`, and `wp_script_add_data()`. See #31888. Built from https://develop.svn.wordpress.org/trunk@32040 git-svn-id: http://core.svn.wordpress.org/trunk@32019 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/functions.wp-scripts.php | 13 ++++++------- wp-includes/version.php | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php index aacf9d15af..6f59a03fe9 100644 --- a/wp-includes/functions.wp-scripts.php +++ b/wp-includes/functions.wp-scripts.php @@ -15,7 +15,7 @@ * * @since 4.2.0 * - * @return WP_Scripts + * @return WP_Scripts WP_Scripts instance. */ function wp_scripts() { global $wp_scripts; @@ -26,13 +26,12 @@ function wp_scripts() { } /** - * Helper function to output a _doing_it_wrong message when applicable + * Helper function to output a _doing_it_wrong message when applicable. * - * @since 4.2.0 - * @access private * @ignore + * @since 4.2.0 * - * @param string $function + * @param string $function Function name. */ function _wp_scripts_maybe_doing_it_wrong( $function ) { if ( did_action( 'init' ) ) { @@ -283,10 +282,10 @@ function wp_script_is( $handle, $list = 'enqueued' ) { * Possible values for $key and $value: * 'conditional' string Comments for IE 6, lte IE 7, etc. * - * @see WP_Dependency::add_data() - * * @since 4.2.0 * + * @see WP_Dependency::add_data() + * * @param string $handle Name of the script. * @param string $key Name of data point for which we're storing a value. * @param mixed $value String containing the data to be added. diff --git a/wp-includes/version.php b/wp-includes/version.php index 333f9bc3f7..f8be9b467f 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-beta4-32039'; +$wp_version = '4.2-beta4-32040'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.