Changeset 25246 for trunk/src/wp-includes/script-loader.php

Timestamp:

09/04/2013 09:16:00 PM (11 years ago)

Author:

nacin

Message:

Ensure zxcvbn.min.js loads when we are guessing the wp-includes URL.

props iandunn, SergeyBiryukov.
fixes #25201.

File:

• trunk/src/wp-includes/script-loader.php (modified) (2 diffs)

trunk/src/wp-includes/script-loader.php

@@ -50 +50 @@
 function wp_default_scripts( &$scripts ) {
 
-    if ( !$guessurl = site_url() )
+
+    if ( ! $guessurl = site_url() ) {
+        $guessed_url = true;
         $guessurl = wp_guess_url();
+    }
 
     $scripts->base_url = $guessurl;
@@ -312 +315 @@
     $scripts->add( 'zxcvbn-async', "/wp-includes/js/zxcvbn-async$suffix.js", array(), '1.0' );
     did_action( 'init' ) && $scripts->localize( 'zxcvbn-async', '_zxcvbnSettings', array(
-        'src' => includes_url( '/js/zxcvbn.min.js' ),
+        'src' => empty( $guessed_url ) ? includes_url( '/js/zxcvbn.min.js' ) : $scripts->base_url . '/wp-includes/js/zxcvbn.min.js',
     ) );