Changeset 43788

Timestamp:

10/22/2018 06:12:55 AM (6 years ago)

Author:

pento

Message:

Script/Style Dependencies: Make sure that inline scripts for handles without a source are printed.

See [36550] for WP_Styles.

Merges [43565] to the 5.0 branch.

Props bpayton.
Fixes #44551.

Location:

branches/5.0

Files:

• . (modified) (1 prop)
• src/wp-includes/class.wp-scripts.php (modified) (2 diffs)
• tests/phpunit/tests/dependencies/scripts.php (modified) (1 diff)

branches/5.0/src/wp-includes/class.wp-scripts.php

@@ -265 +265 @@
         if ( $after_handle ) {
             $after_handle = sprintf( "<script type='text/javascript'>\n%s\n</script>\n", $after_handle );
+        }
+
+        if ( $before_handle || $after_handle ) {
+            $inline_script_tag = "{$cond_before}{$before_handle}{$after_handle}{$cond_after}";
+        } else {
+            $inline_script_tag = '';
         }
 
@@ -308 +314 @@
 
         // A single item may alias a set of items, by having dependencies, but no source.
-        if ( ! $obj->src ) {
+        if ( ! $src ) {
+            if ( $inline_script_tag ) {
+                if ( $this->do_concat ) {
+                    $this->print_html .= $inline_script_tag;
+                } else {
+                    echo $inline_script_tag;
+                }
+            }
+
             return true;
         }

branches/5.0/tests/phpunit/tests/dependencies/scripts.php

@@ -396 +396 @@
         $expected  = "<script type='text/javascript'>\nconsole.log(\"before\");\n</script>\n";
         $expected .= "<script type='text/javascript' src='http://example.com'></script>\n";
+        $expected .= "<script type='text/javascript'>\nconsole.log(\"after\");\n</script>\n";
+
+        $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+    }
+
+    /**
+     * @ticket 44551
+     */
+    function test_wp_add_inline_script_before_for_handle_without_source() {
+        wp_register_script( 'test-example', '' );
+        wp_enqueue_script( 'test-example' );
+        wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
+
+        $expected = "<script type='text/javascript'>\nconsole.log(\"before\");\n</script>\n";
+
+        $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+    }
+
+    /**
+     * @ticket 44551
+     */
+    function test_wp_add_inline_script_after_for_handle_without_source() {
+        wp_register_script( 'test-example', '' );
+        wp_enqueue_script( 'test-example' );
+        wp_add_inline_script( 'test-example', 'console.log("after");' );
+
+        $expected = "<script type='text/javascript'>\nconsole.log(\"after\");\n</script>\n";
+
+        $this->assertEquals( $expected, get_echo( 'wp_print_scripts' ) );
+    }
+
+    /**
+     * @ticket 44551
+     */
+    function test_wp_add_inline_script_before_and_after_for_handle_without_source() {
+        wp_register_script( 'test-example', '' );
+        wp_enqueue_script( 'test-example' );
+        wp_add_inline_script( 'test-example', 'console.log("before");', 'before' );
+        wp_add_inline_script( 'test-example', 'console.log("after");' );
+
+        $expected  = "<script type='text/javascript'>\nconsole.log(\"before\");\n</script>\n";
         $expected .= "<script type='text/javascript'>\nconsole.log(\"after\");\n</script>\n";