Wordpress 3.7

[autoinstalls/wordpress.git] / wp-includes / class.wp-scripts.php

diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index f75929b4abf875beb27ab1f6f3f325b23ca27eb1..5e16632152ef70ed4e06b04ace9194e6e69c5a89 100644 (file)
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -119,6 +119,9 @@ class WP_Scripts extends WP_Dependencies {
 
                $src = esc_url( apply_filters( 'script_loader_src', $src, $handle ) );
 
+               if ( ! $src )
+                       return true;
+
                if ( $this->do_concat )
                        $this->print_html .= "<script type='text/javascript' src='$src'></script>\n";
                else
@@ -133,6 +136,9 @@ class WP_Scripts extends WP_Dependencies {
         * Localizes only if the script has already been added
         */
        function localize( $handle, $object_name, $l10n ) {
+               if ( $handle === 'jquery' )
+                       $handle = 'jquery-core';
+
                if ( is_array($l10n) && isset($l10n['l10n_print_after']) ) { // back compat, preserve the code in 'l10n_print_after' if present
                        $after = $l10n['l10n_print_after'];
                        unset($l10n['l10n_print_after']);