WordPress · enricocarraro · Oct 13, 2020 · Oct 23, 2020 · Oct 23, 2020 · Oct 23, 2020
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/wp-activate.php b/src/wp-activate.php
@@ -212,9 +212,7 @@ function wpmu_activate_stylesheet() {
 	?>
 	</div>
 </div>
-<script type="text/javascript">
-	var key_input = document.getElementById('key');
-	key_input && key_input.focus();
-</script>
 <?php
+
+wp_print_inline_script_tag( "var key_input = document.getElementById('key');\nkey_input && key_input.focus();" );
 get_footer( 'wp-activate' );
diff --git a/src/wp-admin/admin-footer.php b/src/wp-admin/admin-footer.php
@@ -114,6 +114,6 @@
 ?>
 
 <div class="clear"></div></div><!-- wpwrap -->
-<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
+<?php wp_print_inline_script_tag( 'if(typeof wpOnload=="function")wpOnload();' ); ?>
 </body>
 </html>
diff --git a/src/wp-admin/admin-header.php b/src/wp-admin/admin-header.php
@@ -79,18 +79,17 @@
 wp_enqueue_script( 'svg-painter' );
 
 $admin_body_class = preg_replace( '/[^a-z0-9_-]+/i', '-', $hook_suffix );
-?>
-<script type="text/javascript">
-addLoadEvent = function(func){if(typeof jQuery!=='undefined')jQuery(document).ready(func);else if(typeof wpOnload!=='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
-var ajaxurl = '<?php echo admin_url( 'admin-ajax.php', 'relative' ); ?>',
-	pagenow = '<?php echo $current_screen->id; ?>',
-	typenow = '<?php echo $current_screen->post_type; ?>',
-	adminpage = '<?php echo $admin_body_class; ?>',
-	thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-	decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
-	isRtl = <?php echo (int) is_rtl(); ?>;
-</script>
-<?php
+
+$js = 'addLoadEvent = function(func){if(typeof jQuery!=="undefined")jQuery(document).ready(func);else if(typeof wpOnload!=="function"){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+	var ajaxurl = "' . admin_url( 'admin-ajax.php', 'relative' ) . '",
+	pagenow = "' . $current_screen->id . '",
+	typenow = "' . $current_screen->post_type . '",
+	adminpage = "' . $admin_body_class . '",
+	thousandsSeparator = "' . addslashes( $wp_locale->number_format['thousands_sep'] ) . '",
+	decimalPoint = "' . addslashes( $wp_locale->number_format['decimal_point'] ) . '",
+	isRtl = ' . ( (int) is_rtl() ) . ';';
+
+wp_print_inline_script_tag( $js );
 
 /**
  * Enqueue scripts for all admin pages.
@@ -232,11 +231,10 @@
 $admin_body_classes = ltrim( $admin_body_classes . ' ' . $admin_body_class );
 ?>
 <body class="wp-admin wp-core-ui no-js <?php echo $admin_body_classes; ?>">
-<script type="text/javascript">
-	document.body.className = document.body.className.replace('no-js','js');
-</script>
-
 <?php
+
+wp_print_inline_script_tag( 'document.body.className = document.body.className.replace("no-js","js");' );
+
 // Make sure the customize body classes are correct as early as possible.
 if ( current_user_can( 'customize' ) ) {
 	wp_customize_support_script();

diff --git a/src/wp-admin/customize.php b/src/wp-admin/customize.php
@@ -60,11 +60,11 @@
 		);
 		ob_start();
 		?>
-		<?php wp_print_scripts( array( 'wp-util' ) ); ?>
-		<script>
-			wp.ajax.post( 'customize_save', <?php echo wp_json_encode( $request_args ); ?> );
-		</script>
 		<?php
+		wp_print_scripts( array( 'wp-util' ) );
+
+		wp_print_inline_script_tag( 'wp.ajax.post( "customize_save", ' . wp_json_encode( $request_args ) . ' );' );
+
 		$script = ob_get_clean();
 
 		wp_die(
@@ -148,13 +148,10 @@
 
 ?>
 <title><?php echo esc_html( $admin_title ); ?></title>
+<?php
 
-<script type="text/javascript">
-var ajaxurl = <?php echo wp_json_encode( admin_url( 'admin-ajax.php', 'relative' ) ); ?>,
-	pagenow = 'customize';
-</script>
+wp_print_inline_script_tag( 'var ajaxurl = ' . wp_json_encode( admin_url( 'admin-ajax.php', 'relative' ) ) . ', pagenow = "customize";' );
 
-<?php
 /**
  * Fires when Customizer control styles are printed.
  *

diff --git a/src/wp-admin/edit-form-advanced.php b/src/wp-admin/edit-form-advanced.php
@@ -735,8 +735,7 @@
 }
 ?>
 
-<?php if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) : ?>
-<script type="text/javascript">
-try{document.post.title.focus();}catch(e){}
-</script>
-<?php endif; ?>
+<?php
+if ( ! wp_is_mobile() && post_type_supports( $post_type, 'title' ) && '' === $post->post_title ) {
+	wp_print_inline_script_tag( 'try{document.post.title.focus();}catch(e){}' );
+}
diff --git a/src/wp-admin/edit-form-comment.php b/src/wp-admin/edit-form-comment.php
@@ -245,9 +245,7 @@
 </div>
 </form>
 
-<?php if ( ! wp_is_mobile() ) : ?>
-<script type="text/javascript">
-try{document.post.name.focus();}catch(e){}
-</script>
-	<?php
-endif;
+<?php
+if ( ! wp_is_mobile() ) {
+	wp_print_inline_script_tag( 'try{document.post.name.focus();}catch(e){}' );
+}
diff --git a/src/wp-admin/edit-tag-form.php b/src/wp-admin/edit-tag-form.php
@@ -284,9 +284,7 @@
 </form>
 </div>
 
-<?php if ( ! wp_is_mobile() ) : ?>
-<script type="text/javascript">
-try{document.forms.edittag.name.focus();}catch(e){}
-</script>
-	<?php
-endif;
+<?php
+if ( ! wp_is_mobile() ) {
+	wp_print_inline_script_tag( 'try{document.forms.edittag.name.focus();}catch(e){}' );
+}
diff --git a/src/wp-admin/edit-tags.php b/src/wp-admin/edit-tags.php
@@ -649,12 +649,10 @@
 
 </div><!-- /wrap -->
 
-<?php if ( ! wp_is_mobile() ) : ?>
-<script type="text/javascript">
-try{document.forms.addtag['tag-name'].focus();}catch(e){}
-</script>
-	<?php
-endif;
+<?php
+if ( ! wp_is_mobile() ) {
+	wp_print_inline_script_tag( 'try{document.forms.addtag["tag-name"].focus();}catch(e){}' );
+}
 
 $wp_list_table->inline_edit();
 

diff --git a/src/wp-admin/export.php b/src/wp-admin/export.php
@@ -23,8 +23,7 @@
  * @since 3.5.0
  */
 function export_add_js() {
-	?>
-<script type="text/javascript">
+	$js = <<<'JS'
 	jQuery(document).ready(function($){
 		var form = $('#export-filters'),
 			filters = form.find('.export-filters');
@@ -38,8 +37,8 @@ function export_add_js() {
 			}
 		});
 	});
-</script>
-	<?php
+JS;
+	wp_print_inline_script_tag( $js );
 }
 add_action( 'admin_head', 'export_add_js' );
 

diff --git a/src/wp-admin/includes/ajax-actions.php b/src/wp-admin/includes/ajax-actions.php
@@ -3740,7 +3740,7 @@ function wp_ajax_parse_embed() {
 			$script_src = includes_url( 'js/wp-embed.min.js' );
 		}
 
-		$return['head']    = '<script src="' . $script_src . '"></script>';
+		$return['head']    = wp_get_script_tag( array( 'src' => $script_src ) );
 		$return['sandbox'] = true;
 	}
 

diff --git a/src/wp-admin/includes/class-bulk-upgrader-skin.php b/src/wp-admin/includes/class-bulk-upgrader-skin.php
@@ -105,7 +105,7 @@ public function error( $error ) {
 			}
 			$this->error = implode( ', ', $messages );
 		}
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+		wp_print_inline_script_tag( 'jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();' );
 	}
 
 	/**
@@ -126,7 +126,7 @@ public function bulk_footer() {
 	public function before( $title = '' ) {
 		$this->in_loop = true;
 		printf( '<h2>' . $this->upgrader->strings['skin_before_update_header'] . ' <span class="spinner waiting-' . $this->upgrader->update_current . '"></span></h2>', $title, $this->upgrader->update_current, $this->upgrader->update_count );
-		echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");</script>';
+		wp_print_inline_script_tag( 'jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').css("display", "inline-block");' );
 		// This progress messages div gets moved via JavaScript when clicking on "Show details.".
 		echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr( $this->upgrader->update_current ) . '"><p>';
 		$this->flush_output();
@@ -144,7 +144,7 @@ public function after( $title = '' ) {
 				echo '<div class="error"><p>' . sprintf( $this->upgrader->strings['skin_update_failed'], $title ) . '</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();</script>';
+			wp_print_inline_script_tag( 'jQuery(\'#progress-' . esc_js( $this->upgrader->update_current ) . '\').show();' );
 		}
 		if ( $this->result && ! is_wp_error( $this->result ) ) {
 			if ( ! $this->error ) {
@@ -154,7 +154,7 @@ public function after( $title = '' ) {
 					'</p></div>';
 			}
 
-			echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>';
+			wp_print_inline_script_tag( 'jQuery(\'.waiting-' . esc_js( $this->upgrader->update_current ) . '\').hide();</script>' );
 		}
 
 		$this->reset();

diff --git a/src/wp-admin/includes/class-custom-image-header.php b/src/wp-admin/includes/class-custom-image-header.php
@@ -340,10 +340,9 @@ public function js_1() {
 				$default_color = '#' . $default_color;
 			}
 		}
-		?>
-<script type="text/javascript">
+		$js  = <<<JS
 (function($){
-	var default_color = '<?php echo $default_color; ?>',
+	var default_color = '$default_color',
 		header_text_fields;
 
 	function pickColor(color) {
@@ -379,13 +378,13 @@ function toggle_text() {
 			}
 		});
 		$('#display-header-text').click( toggle_text );
-		<?php if ( ! display_header_text() ) : ?>
-		toggle_text();
-		<?php endif; ?>
+JS;
+		$js .= ! display_header_text() ? 'toggle_text()' : '';
+		$js .= <<<JS
 	});
 })(jQuery);
-</script>
-		<?php
+JS;
+		wp_print_inline_script_tag( $js );
 	}
 
 	/**
@@ -395,21 +394,20 @@ function toggle_text() {
 	 */
 	public function js_2() {
 
-		?>
-<script type="text/javascript">
+		$js = '
 	function onEndCrop( coords ) {
-		jQuery( '#x1' ).val(coords.x);
-		jQuery( '#y1' ).val(coords.y);
-		jQuery( '#width' ).val(coords.w);
-		jQuery( '#height' ).val(coords.h);
+		jQuery( "#x1" ).val(coords.x);
+		jQuery( "#y1" ).val(coords.y);
+		jQuery( "#width" ).val(coords.w);
+		jQuery( "#height" ).val(coords.h);
 	}
 
 	jQuery(document).ready(function() {
-		var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
-		var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
+		var xinit = ' . absint( get_theme_support( 'custom-header', 'width' ) ) . '
+		var yinit = ' . absint( get_theme_support( 'custom-header', 'height' ) ) . '
 		var ratio = xinit / yinit;
-		var ximg = jQuery('img#upload').width();
-		var yimg = jQuery('img#upload').height();
+		var ximg = jQuery("img#upload").width();
+		var yimg = jQuery("img#upload").height();
 
 		if ( yimg < yinit || ximg < xinit ) {
 			if ( ximg / yimg > ratio ) {
@@ -421,45 +419,38 @@ function onEndCrop( coords ) {
 			}
 		}
 
-		jQuery('img#upload').imgAreaSelect({
+		jQuery("img#upload").imgAreaSelect({
 			handles: true,
 			keys: true,
 			show: true,
 			x1: 0,
 			y1: 0,
 			x2: xinit,
-			y2: yinit,
-			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-				?>
-			aspectRatio: xinit + ':' + yinit,
-				<?php
-			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
-				?>
-			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
-				<?php
-			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-				?>
-			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
-				<?php
-			}
-			?>
+			y2: yinit,';
+
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			$js .= 'aspectRatio: xinit + ":" + yinit,';
+		}
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			$js .= 'maxHeight: ' . get_theme_support( 'custom-header', 'height' ) . ',';
+		}
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			$js .= 'maxWidth: ' . get_theme_support( 'custom-header', 'width' ) . ',';
+		}
+		$js .= '
 			onInit: function () {
-				jQuery('#width').val(xinit);
-				jQuery('#height').val(yinit);
+				jQuery("#width").val(xinit);
+				jQuery("#height").val(yinit);
 			},
 			onSelectChange: function(img, c) {
-				jQuery('#x1').val(c.x1);
-				jQuery('#y1').val(c.y1);
-				jQuery('#width').val(c.width);
-				jQuery('#height').val(c.height);
+				jQuery("#x1").val(c.x1);
+				jQuery("#y1").val(c.y1);
+				jQuery("#width").val(c.width);
+				jQuery("#height").val(c.height);
 			}
 		});
-	});
-</script>
-		<?php
+	});';
+		wp_print_inline_script_tag( $js );
 	}
 
 	/**