<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[45457] trunk/src/wp-includes/script-loader.php: Fix previous WPCS errors in `script-loader.php` triggered by [45456].</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/45457">45457</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/45457","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-05-28 03:31:55 +0000 (Tue, 28 May 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Fix previous WPCS errors in `script-loader.php` triggered by <a href="https://core.trac.wordpress.org/changeset/45456">[45456]</a>.
See <a href="https://core.trac.wordpress.org/ticket/45346">#45346</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2019-05-28 02:42:24 UTC (rev 45456)
+++ trunk/src/wp-includes/script-loader.php 2019-05-28 03:31:55 UTC (rev 45457)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> script_concat_settings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $force_uncompressed;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load tinymce.js when running from /src, otherwise load wp-tinymce.js.gz (in production) or
</span><span class="cx" style="display: block; padding: 0 10px"> // tinymce.min.js (when SCRIPT_DEBUG is true).
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,8 +754,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $init_obj .= $key . ':' . $val . ',';
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $value ) && is_string( $value ) && (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( '{' == $value{0} && '}' == $value{strlen( $value ) - 1} ) ||
- ( '[' == $value{0} && ']' == $value{strlen( $value ) - 1} ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( '{' === $value{0} && '}' === $value{strlen( $value ) - 1} ) ||
+ ( '[' === $value{0} && ']' === $value{strlen( $value ) - 1} ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '/^\(?function ?\(/', $value ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $init_obj .= $key . ':' . $value . ',';
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -844,8 +844,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_default_scripts( &$scripts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = wp_scripts_get_suffix();
</span><span class="cx" style="display: block; padding: 0 10px"> $dev_suffix = wp_scripts_get_suffix( 'dev' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $guessurl = site_url();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $guessurl = site_url() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $guessurl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $guessed_url = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $guessurl = wp_guess_url();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1469,7 +1470,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'themePreviewUnavailable' => __( 'Sorry, you can’t preview new themes when you have changes scheduled or saved as a draft. Please publish your changes, or wait until they publish to preview new themes.' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'themeInstallUnavailable' => sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: URL to Add Themes admin screen */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ __( 'You won’t be able to install new themes from here yet since your install requires SFTP credentials. For now, please <a href="%s">add themes in the admin</a>.' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_url( admin_url( 'theme-install.php' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'publishSettings' => __( 'Publish Settings' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,7 +1884,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $guessurl = site_url() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $guessurl = site_url();
+
+ if ( ! $guessurl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $guessurl = wp_guess_url();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1907,11 +1910,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'cyrillic' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cyrillic' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',cyrillic,cyrillic-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'greek' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'greek' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',greek,greek-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'vietnamese' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'vietnamese' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',vietnamese';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2110,11 +2113,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Reordered array, if needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_prototype_before_jquery( $js_array ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $prototype = array_search( 'prototype', $js_array, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prototype = array_search( 'prototype', $js_array, true );
+
+ if ( false === $prototype ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $js_array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $jquery = array_search( 'jquery', $js_array, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $jquery = array_search( 'jquery', $js_array, true );
+
+ if ( false === $jquery ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $js_array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2330,7 +2337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return preg_replace( '#^wp-admin/#', './', $src );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'colors' == $handle ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'colors' === $handle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $color = get_user_option( 'admin_color' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $color ) || ! isset( $_wp_admin_css_colors[ $color ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2450,8 +2457,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $zip = 'gzip';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $concat = trim( $wp_scripts->concat, ', ' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $concat = trim( $wp_scripts->concat, ', ' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $concat ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $wp_scripts->print_code ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\n<script type='text/javascript'>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> echo "/* <![CDATA[ */\n"; // not needed in HTML 5
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2460,7 +2468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</script>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $concat = str_split( $concat, 128 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $concat = str_split( $concat, 128 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $concatenated = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $concat as $key => $chunk ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2630,11 +2638,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $zip = 'gzip';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $concat = trim( $wp_styles->concat, ', ' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $concat = trim( $wp_styles->concat, ', ' );
+
+ if ( $concat ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dir = $wp_styles->text_direction;
</span><span class="cx" style="display: block; padding: 0 10px"> $ver = $wp_styles->default_version;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $concat = str_split( $concat, 128 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $concat = str_split( $concat, 128 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $concatenated = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $concat as $key => $chunk ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2668,7 +2678,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function script_concat_settings() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $concatenate_scripts, $compress_scripts, $compress_css;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $concatenate_scripts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2723,7 +2733,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'enqueue_block_assets' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'enqueue_block_assets' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre>
</div>
</div>
</body>
</html>