<!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>[44566] trunk/src: Coding Standards: Fix the `Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace` violations.</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/44566">44566</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/44566","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-01-11 06:39:55 +0000 (Fri, 11 Jan 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'>Coding Standards: Fix the `Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace` violations.
See <a href="https://core.trac.wordpress.org/ticket/45934">#45934</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenfunctionsphp">trunk/src/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocalephp">trunk/src/wp-includes/class-wp-locale.php</a></li>
<li><a href="#trunksrcwpincludesclasswptextdiffrenderertablephp">trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-admin/includes/export.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,11 +203,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Site URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wxr_site_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Multisite: the base URL.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Multisite: the base URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> return network_home_url();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // WordPress (single site): the blog URL.
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // WordPress (single site): the blog URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_bloginfo_rss( 'url' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-admin/includes/image.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,8 +215,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $attachment_id, '_thumbnail_id', $sub_attachment_id );
</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">- } // Try to create image thumbnails for PDFs
- elseif ( 'application/pdf' === $mime_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'application/pdf' === $mime_type ) {
+ // Try to create image thumbnails for PDFs.
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $fallback_sizes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail',
</span><span class="cx" style="display: block; padding: 0 10px"> 'medium',
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-admin/update-core.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string = $update->current;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // If the only available update is a partial builds, it doesn't need a language-specific version string.
- elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
+ // If the only available update is a partial builds, it doesn't need a language-specific version string.
</ins><span class="cx" style="display: block; padding: 0 10px"> $version_string = $update->current;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,8 +121,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' != $update->locale && ( ! isset( $wp_local_package ) || $wp_local_package != $update->locale ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hint">' . __( 'This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.' ) . '</p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // Partial builds don't need language-specific warnings.
- elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_US' == $update->locale && get_locale() != 'en_US' && ( ! $update->packages->partial && $wp_version == $update->partial_version ) ) {
+ // Partial builds don't need language-specific warnings.
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p class="hint">' . sprintf( __( 'You are about to install WordPress %s <strong>in English (US).</strong> There is a chance this update will break your translation. You may prefer to wait for the localized version to be released.' ), $update->response != 'development' ? $update->current : '' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '</form>';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,8 +455,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // get the URL of the next image attachment...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $next_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = get_attachment_link( $next_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // or get the URL of the first image attachment.
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // or get the URL of the first image attachment.
</ins><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/functions.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-content/themes/twentythirteen/functions.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -587,8 +587,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // get the URL of the next image attachment...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $next_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = get_attachment_link( $next_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // or get the URL of the first image attachment.
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // or get the URL of the first image attachment.
</ins><span class="cx" style="display: block; padding: 0 10px"> $next_attachment_url = get_attachment_link( reset( $attachment_ids ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocalephp"></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/class-wp-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/class-wp-locale.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,8 +216,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set text direction.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $GLOBALS['text_direction'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = $GLOBALS['text_direction'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
- elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
+ } elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = 'rtl';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptextdiffrenderertablephp"></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/class-wp-text-diff-renderer-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,8 +389,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Best match of this final is already taken? Must mean this final is a new row.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $orig_matches[ $o ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $final_matches[ $f ] = 'x';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // Best match of this orig is already taken? Must mean this orig is a deleted row.
- elseif ( isset( $final_matches[ $f ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $final_matches[ $f ] ) ) {
+ // Best match of this orig is already taken? Must mean this orig is a deleted row.
</ins><span class="cx" style="display: block; padding: 0 10px"> $orig_matches[ $o ] = 'x';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></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/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2897,8 +2897,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If we found the page then format the data.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page->ID && ( $page->post_type == 'page' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_page( $page );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // If the page doesn't exist indicate that.
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ // If the page doesn't exist indicate that.
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></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/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/formatting.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2478,8 +2478,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $stacksize <= 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = '';
</span><span class="cx" style="display: block; padding: 0 10px"> // or close to be safe $tag = '/' . $tag;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // if stacktop value = tag close value then pop
- elseif ( $tagstack[ $stacksize - 1 ] == $tag ) { // found closing tag
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // if stacktop value = tag close value then pop
+ } elseif ( $tagstack[ $stacksize - 1 ] == $tag ) { // found closing tag
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = '</' . $tag . '>'; // Close Tag
</span><span class="cx" style="display: block; padding: 0 10px"> // Pop
</span><span class="cx" style="display: block; padding: 0 10px"> array_pop( $tagstack );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2505,18 +2506,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's an empty tag "< >", do nothing
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // do nothing
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // ElseIf it presents itself as a self-closing tag...
- elseif ( substr( $regex[2], -1 ) == '/' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( substr( $regex[2], -1 ) == '/' ) { // ElseIf it presents itself as a self-closing tag...
</ins><span class="cx" style="display: block; padding: 0 10px"> // ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
</span><span class="cx" style="display: block; padding: 0 10px"> // immediately close it with a closing tag (the tag will encapsulate no text as a result)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $tag, $single_tags ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // ElseIf it's a known single-entity tag but it doesn't close itself, do so
- elseif ( in_array( $tag, $single_tags ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $tag, $single_tags ) ) { // ElseIf it's a known single-entity tag but it doesn't close itself, do so
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex[2] .= '/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // Else it's not a single-entity tag
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // Else it's not a single-entity tag
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the top of the stack is the same as the tag we want to push, close previous tag
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $stacksize > 0 && ! in_array( $tag, $nestable_tags ) && $tagstack[ $stacksize - 1 ] == $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tagqueue = '</' . array_pop( $tagstack ) . '>';
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></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/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/general-template.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,8 +920,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( home_url( '/' ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_get_attachment_image( $custom_logo_id, 'full', false, $custom_logo_attr )
</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 no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
- elseif ( is_customize_preview() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_customize_preview() ) {
+ // If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( home_url( '/' ) )
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></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/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/load.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -68,11 +68,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fix for IIS when running with PHP ISAPI
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // IIS Mod-Rewrite
</del><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // IIS Mod-Rewrite
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // IIS Isapi_Rewrite
- elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+ // IIS Isapi_Rewrite
</ins><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Use ORIG_PATH_INFO if there is no PATH_INFO
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2019-01-11 06:25:37 UTC (rev 44565)
+++ trunk/src/wp-includes/media.php 2019-01-11 06:39:55 UTC (rev 44566)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,8 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( intval( $content_width ) > 0 && 'edit' === $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = min( intval( $content_width ), $max_width );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } // $size == 'full' has no constraint
- else {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else { // $size == 'full' has no constraint
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_width = $width;
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = $height;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>