X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/11be8dc178e77d0b46189bbd8e33a216a9b90942..8a4706fdeb1ae30268e510df6ccf3c39b3028059:/wp-includes/functions.wp-scripts.php
diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index 1f7e6aca..49b760f0 100644
--- a/wp-includes/functions.wp-scripts.php
+++ b/wp-includes/functions.wp-scripts.php
@@ -16,7 +16,7 @@
* register/enqueue new scripts.
*
* @since r16
- * @see WP_Scripts::print_scripts()
+ * @see WP_Dependencies::print_scripts()
*/
function wp_print_scripts( $handles = false ) {
do_action( 'wp_print_scripts' );
@@ -24,9 +24,13 @@ function wp_print_scripts( $handles = false ) {
$handles = false;
global $wp_scripts;
- if ( !is_a($wp_scripts, 'WP_Scripts') ) {
+ if ( ! is_a( $wp_scripts, 'WP_Scripts' ) ) {
+ if ( ! did_action( 'init' ) )
+ _doing_it_wrong( __FUNCTION__, sprintf( __( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+ 'wp_enqueue_scripts
', 'admin_enqueue_scripts
', 'init
' ), '3.3' );
+
if ( !$handles )
- return array(); // No need to instantiate if nothing's there.
+ return array(); // No need to instantiate if nothing is there.
else
$wp_scripts = new WP_Scripts();
}
@@ -35,31 +39,59 @@ function wp_print_scripts( $handles = false ) {
}
/**
- * Register new JavaScript file.
+ * Register new Javascript file.
*
* @since r16
- * @see WP_Scripts::add() For parameter information.
+ * @param string $handle Script name
+ * @param string $src Script url
+ * @param array $deps (optional) Array of script names on which this script depends
+ * @param string|bool $ver (optional) Script version (used for cache busting), set to null to disable
+ * @param bool $in_footer (optional) Whether to enqueue the script before or before