Changeset 31189

Timestamp:

01/16/2015 01:10:39 AM (10 years ago)

Author:

wonderboymusic

Message:

Revert [31032], this did not get much love.

See #25277.

Location:

trunk/src/wp-includes

Files:

• class.wp-scripts.php (modified) (5 diffs)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/class.wp-scripts.php

@@ -28 +28 @@
     public $print_code = '';
     public $ext_handles = '';
-    public $print_after_html = '';
     public $ext_version = '';
     public $default_dirs;
@@ -69 +68 @@
     }
 
-    public function print_extra_script( $handle, $echo = true, $key = 'data' ) {
-        if ( ! $output = $this->get_data( $handle, $key ) ) {
+    public function print_extra_script( $handle, $echo = true ) {
+        if ( !$output = $this->get_data( $handle, 'data' ) )
             return;
-        }
-
-        if ( ! $echo ) {
+
+        if ( !$echo )
             return $output;
-        }
 
         echo "<script type='text/javascript'>\n"; // CDATA and type='text/javascript' is not needed for HTML 5
@@ -121 +118 @@
             if ( $this->in_default_dir($srce) ) {
                 $this->print_code .= $this->print_extra_script( $handle, false );
-                $this->print_after_html .= "\n" . $this->print_extra_script( $handle, false, 'data-after' );
                 $this->concat .= "$handle,";
                 $this->concat_version .= "$handle$ver";
@@ -160 +156 @@
         if ( $this->do_concat ) {
             $this->print_html .= $tag;
-            $this->print_after_html .= $this->print_extra_script( $handle, false, 'data-after' ) . "\n";
         } else {
             echo $tag;
-            $this->print_extra_script( $handle, true, 'data-after' );
         }
 
@@ -268 +262 @@
         $this->concat_version = '';
         $this->print_html = '';
-        $this->print_after_html = '';
         $this->ext_version = '';
         $this->ext_handles = '';

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

@@ -861 +861 @@
     }
 
-    if ( ! empty( $wp_scripts->print_html ) ) {
+    if ( !empty($wp_scripts->print_html) )
         echo $wp_scripts->print_html;
-    }
-
-    if ( ! empty( $wp_scripts->print_after_html ) ) {
-        if ( $wp_scripts->do_concat ) {
-            echo "<script type='text/javascript'>\n";
-            echo "/* <![CDATA[ */\n"; // not needed in HTML 5
-            echo trim( $wp_scripts->print_after_html ) . "\n";
-            echo "/* ]]> */\n";
-            echo "</script>\n";
-        } else {
-            echo $wp_scripts->print_after_html;
-        }
-    }
 }