From cf6adef68f1788a9cf3a577884a9596d48063eb5 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 16 Jan 2015 01:11:23 +0000
Subject: [PATCH] Revert [31032], this did not get much love.

See #25277.

Built from https://develop.svn.wordpress.org/trunk@31189


git-svn-id: http://core.svn.wordpress.org/trunk@31170 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class.wp-scripts.php | 13 +++----------
 wp-includes/script-loader.php    | 15 +--------------
 wp-includes/version.php          |  2 +-
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/wp-includes/class.wp-scripts.php b/wp-includes/class.wp-scripts.php
index 97c49d30dc..ae0148ee8d 100644
--- a/wp-includes/class.wp-scripts.php
+++ b/wp-includes/class.wp-scripts.php
@@ -27,7 +27,6 @@ class WP_Scripts extends WP_Dependencies {
 	public $print_html = '';
 	public $print_code = '';
 	public $ext_handles = '';
-	public $print_after_html = '';
 	public $ext_version = '';
 	public $default_dirs;
 
@@ -68,14 +67,12 @@ class WP_Scripts extends WP_Dependencies {
 		return $this->print_extra_script( $handle, $echo );
 	}
 
-	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
 		echo "/* <![CDATA[ */\n";
@@ -120,7 +117,6 @@ class WP_Scripts extends WP_Dependencies {
 			$srce = apply_filters( 'script_loader_src', $src, $handle );
 			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";
 				return true;
@@ -159,10 +155,8 @@ class WP_Scripts extends WP_Dependencies {
 
 		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' );
 		}
 
 		return true;
@@ -267,7 +261,6 @@ class WP_Scripts extends WP_Dependencies {
 		$this->concat = '';
 		$this->concat_version = '';
 		$this->print_html = '';
-		$this->print_after_html = '';
 		$this->ext_version = '';
 		$this->ext_handles = '';
 	}
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index 817f4258eb..c3b3cfd9c1 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -860,21 +860,8 @@ function _print_scripts() {
 		echo "<script type='text/javascript' src='" . esc_attr($src) . "'></script>\n";
 	}
 
-	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;
-		}
-	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 23a19c297c..78b846ca3e 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31188';
+$wp_version = '4.2-alpha-31189';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.