<!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>[49193] trunk: Coding Standards: Replace alias PHP functions with the canonical names.</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/49193">49193</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/49193","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-18 17:25:10 +0000 (Sun, 18 Oct 2020)</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: Replace alias PHP functions with the canonical names.
Using the canonical function name for PHP functions is strongly recommended, as aliases may be deprecated or removed without (much) warning.
This replaces all uses of the following:
* `join()` with `implode()`
* `sizeof()` with `count()`
* `is_writeable()` with `is_writable()`
* `doubleval()` with a `(float)` cast
In part, this is a follow-up to <a href="https://core.trac.wordpress.org/ticket/47746">#47746</a>.
Props jrf.
See <a href="https://core.trac.wordpress.org/ticket/50767">#50767</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>
<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminlinkphp">trunk/src/wp-admin/link.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyincstartercontentphp">trunk/src/wp-content/themes/twentytwenty/inc/starter-content.php</a></li>
<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkernavmenuphp">trunk/src/wp-includes/class-walker-nav-menu.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptextdiffrenderertablephp">trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsnetworkphp">trunk/src/wp-includes/ms-network.php</a></li>
<li><a href="#trunksrcwpincludesmssitephp">trunk/src/wp-includes/ms-site.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetcustomhtmlphp">trunk/src/wp-includes/widgets/class-wp-widget-custom-html.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaphp">trunk/src/wp-includes/widgets/class-wp-widget-media.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestsdbphp">trunk/tests/phpunit/tests/db.php</a></li>
<li><a href="#trunktestsphpunittestsformattingAutopphp">trunk/tests/phpunit/tests/formatting/Autop.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
<li><a href="#trunktestsphpunittestspostbodyClassphp">trunk/tests/phpunit/tests/post/bodyClass.php</a></li>
<li><a href="#trunktestsphpunittestspostpostClassphp">trunk/tests/phpunit/tests/post/postClass.php</a></li>
<li><a href="#trunktestsphpunittestsposttemplatephp">trunk/tests/phpunit/tests/post/template.php</a></li>
<li><a href="#trunktestsphpunittestswidgetsmediagallerywidgetphp">trunk/tests/phpunit/tests/widgets/media-gallery-widget.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/edit-comments.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = add_query_arg( 'deleted', $deleted, $redirect_to );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $trashed || $spammed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_to = add_query_arg( 'ids', join( ',', $comment_ids ), $redirect_to );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $redirect_to = add_query_arg( 'ids', implode( ',', $comment_ids ), $redirect_to );
</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"> wp_safe_redirect( $redirect_to );
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></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/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/edit.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => $trashed,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ids' => join( ',', $post_ids ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ids' => implode( ',', $post_ids ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'locked' => $locked,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -442,7 +442,7 @@
</span><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"> if ( $messages ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<div id="message" class="updated notice is-dismissible"><p>' . implode( ' ', $messages ) . '</p></div>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $messages );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></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/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo join( "\n", $results );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo implode( "\n", $results );
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</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="trunksrcwpadminincludesclasswpcommentslisttablephp"></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/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,7 +615,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $the_comment_class ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_comment_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $the_comment_class = join( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $the_comment_class = implode( ' ', get_comment_class( $the_comment_class, $comment, $comment->comment_post_ID ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $comment->comment_post_ID > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $comment->comment_post_ID );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></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/class-wp-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-importer.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_arg = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $return = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $il = sizeof( $args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $il = count( $args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1, $il; $i < $il; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (bool) preg_match( '/^--(.+)/', $args[ $i ], $match ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +976,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $infinite_scroll ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pagination_links_class .= ' hide-if-js';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= "\n<span class='$pagination_links_class'>" . join( "\n", $page_links ) . '</span>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= "\n<span class='$pagination_links_class'>" . implode( "\n", $page_links ) . '</span>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $total_pages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_class = $total_pages < 2 ? ' one-page' : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1242,7 +1242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $with_id ? "id='$column_key'" : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $class ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = "class='" . join( ' ', $class ) . "'";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = "class='" . implode( ' ', $class ) . "'";
</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"> echo "<$tag $scope $id $class>$column_display_name</$tag>";
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></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/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -614,7 +614,7 @@
</span><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"> /* translators: Used between list items, there is a space after the comma. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo join( __( ', ' ), $out );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo implode( __( ', ' ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . get_taxonomy( $taxonomy )->labels->no_terms . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></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/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1219,7 +1219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_links = apply_filters( 'post_column_taxonomy_links', $term_links, $taxonomy, $terms );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Used between list items, there is a space after the comma. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo join( __( ', ' ), $term_links );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo implode( __( ', ' ), $term_links );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span aria-hidden="true">—</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthphp"></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/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1855,7 +1855,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hosts = explode( ',', WP_ACCESSIBLE_HOSTS );
</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 ( $blocked && 0 === sizeof( $hosts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blocked && 0 === count( $hosts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'critical';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'HTTP requests are blocked' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1870,7 +1870,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blocked && 0 < sizeof( $hosts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $blocked && 0 < count( $hosts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result['label'] = __( 'HTTP requests are partially blocked' );
</span></span></pre></div>
<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 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/export.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fetch 20 posts at a time rather than loading the entire table into memory.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $next_posts = array_splice( $post_ids, 0, 20 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = 'WHERE ID IN (' . join( ',', $next_posts ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = 'WHERE ID IN (' . implode( ',', $next_posts ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts = $wpdb->get_results( "SELECT * FROM {$wpdb->posts} $where" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Begin Loop.
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/file.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +489,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_content = file_get_contents( $real_file );
</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 ( ! is_writeable( $real_file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_writable( $real_file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'file_not_writable' );
</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="trunksrcwpadminincludesmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/media.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1118,7 +1118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> " /><label for='image-align-{$name}-{$post->ID}' class='align image-align-{$name}-label'>$label</label>";
</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">- return join( "\n", $out );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( "\n", $out );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1195,7 +1195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Size' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => 'html',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'html' => join( "\n", $out ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'html' => implode( "\n", $out ),
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1424,7 +1424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $values[] = $term->slug;
</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">- $t['value'] = join( ', ', $values );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t['value'] = implode( ', ', $values );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_fields[ $taxonomy ] = $t;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1784,7 +1784,7 @@
</span><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"> if ( ! empty( $field['helps'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item .= "<p class='help'>" . implode( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $item .= "</td>\n\t\t</tr>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1883,7 +1883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $values[] = $term->slug;
</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">- $t['value'] = join( ', ', $values );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t['value'] = implode( ', ', $values );
</ins><span class="cx" style="display: block; padding: 0 10px"> $t['taxonomy'] = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_fields[ $taxonomy ] = $t;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1976,7 +1976,7 @@
</span><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"> if ( ! empty( $field['helps'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item .= "<p class='help'>" . join( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item .= "<p class='help'>" . implode( "</p>\n<p class='help'>", array_unique( (array) $field['helps'] ) ) . '</p>';
</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"> $item .= "</td>\n\t\t</tr>\n";
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></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/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/misc.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $perms ) {
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $filename, $perms | 0644 );
</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 ( ! is_writeable( $filename ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! is_writable( $filename ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</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="trunksrcwpadminincludesrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/revision.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/revision.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If we only have one revision, the initial revision is missing; This happens
</span><span class="cx" style="display: block; padding: 0 10px"> * when we have an autsosave and the user has clicked 'View the Autosave'
</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 ( 1 === sizeof( $revisions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 === count( $revisions ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $revisions[ $post->ID ] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $post->ID,
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => get_the_title( $post->ID ),
</span></span></pre></div>
<a id="trunksrcwpadminincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/taxonomy.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/taxonomy.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,7 +278,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_names[] = $term->name;
</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">- $terms_to_edit = esc_attr( join( ',', $term_names ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $terms_to_edit = esc_attr( implode( ',', $term_names ) );
</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"> * Filters the comma-separated list of terms available to edit.
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1112,7 +1112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = $option->dupes - 1;
</span><span class="cx" style="display: block; padding: 0 10px"> $dupe_ids = $wpdb->get_col( $wpdb->prepare( "SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dupe_ids ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dupe_ids = join( ',', $dupe_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dupe_ids = implode( ',', $dupe_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "DELETE FROM $wpdb->options WHERE option_id IN ($dupe_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="trunksrcwpadminlinkphp"></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/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/link.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,7 +60,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $this_file );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $all_links = join( ',', $linkcheck );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $all_links = implode( ',', $linkcheck );
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Should now have an array of links we can change:
</span><span class="cx" style="display: block; padding: 0 10px"> * $q = $wpdb->query("update $wpdb->links SET link_category='$category' WHERE link_id IN ($all_links)");
</span></span></pre></div>
<a id="trunksrcwpadminmenuheaderphp"></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/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/menu-header.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = esc_attr( $item[4] );
</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">- $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = $class ? ' class="' . implode( ' ', $class ) . '"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $img = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $img_style = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = esc_attr( $sub_item[4] );
</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">- $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = $class ? ' class="' . implode( ' ', $class ) . '"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_hook = get_plugin_page_hook( $sub_item[2], $item[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $sub_file = $sub_item[2];
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></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/network/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/network/themes.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h1>' . esc_html( $title ) . '</h1>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = self_admin_url( 'update.php?action=update-selected-themes&themes=' . urlencode( join( ',', $themes ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = self_admin_url( 'update.php?action=update-selected-themes&themes=' . urlencode( implode( ',', $themes ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( $url, 'bulk-update-themes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
</span></span></pre></div>
<a id="trunksrcwpadminplugineditorphp"></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/plugin-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/plugin-editor.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_plugin_active( $plugin ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_writeable( $real_file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_writable( $real_file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin file name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Editing %s (active)' ), '<strong>' . esc_html( $file ) . '</strong>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -203,7 +203,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Browsing %s (active)' ), '<strong>' . esc_html( $file ) . '</strong>' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_writeable( $real_file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_writable( $real_file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Plugin file name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Editing %s (inactive)' ), '<strong>' . esc_html( $file ) . '</strong>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_writeable( $real_file ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_writable( $real_file ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="editor-notices">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ), true ) ) { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-warning inline active-plugin-edit-warning">
</span></span></pre></div>
<a id="trunksrcwpadminpluginsphp"></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/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/plugins.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="wrap">';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h1>' . esc_html( $title ) . '</h1>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = self_admin_url( 'update.php?action=update-selected&plugins=' . urlencode( join( ',', $plugins ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = self_admin_url( 'update.php?action=update-selected&plugins=' . urlencode( implode( ',', $plugins ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = wp_nonce_url( $url, 'bulk-update-plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<iframe src='$url' style='width: 100%; height:100%; min-height:850px;'></iframe>";
</span></span></pre></div>
<a id="trunksrcwpadminthemeeditorphp"></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/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/theme-editor.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,7 +301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_child_theme() && $theme->get_stylesheet() === get_template() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-warning inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_writeable( $file ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_writable( $file ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <strong><?php _e( 'Caution:' ); ?></strong>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'This is a file in your current parent theme.' ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( is_writeable( $file ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( is_writable( $file ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="submit">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button( __( 'Update File' ), 'primary', 'submit', false ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></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/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-admin/upload.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'trashed' => count( $post_ids ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'ids' => join( ',', $post_ids ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'ids' => implode( ',', $post_ids ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $location
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyincstartercontentphp"></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/twentytwenty/inc/starter-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/inc/starter-content.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-content/themes/twentytwenty/inc/starter-content.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_title' => __( 'The New UMoMA Opens its Doors', 'twentytwenty' ),
</span><span class="cx" style="display: block; padding: 0 10px"> // Use the above featured image with the predefined about page.
</span><span class="cx" style="display: block; padding: 0 10px"> 'thumbnail' => '{{image-opening}}',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_content' => join(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_content' => implode(
</ins><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- wp:group {"align":"wide"} -->',
</span></span></pre></div>
<a id="trunksrcwpincludesbookmarktemplatephp"></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/bookmark-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark-template.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/bookmark-template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['class'] = explode( ' ', $parsed_args['class'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['class'] = array_map( 'sanitize_html_class', $parsed_args['class'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['class'] = trim( join( ' ', $parsed_args['class'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['class'] = trim( implode( ' ', $parsed_args['class'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['categorize'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = get_terms(
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></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/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/category-template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,11 +1010,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Note: this is redundant but doesn't harm.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $return = "<ul class='wp-tag-cloud' role='list'>\n\t<li>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return .= join( "</li>\n\t<li>", $a );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return .= implode( "</li>\n\t<li>", $a );
</ins><span class="cx" style="display: block; padding: 0 10px"> $return .= "</li>\n</ul>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return = join( $args['separator'], $a );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return = implode( $args['separator'], $a );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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">@@ -1349,7 +1349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $term_links = apply_filters( "term_links-{$taxonomy}", $links ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.UseUnderscores
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $before . join( $sep, $term_links ) . $after;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $before . implode( $sep, $term_links ) . $after;
</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>
<a id="trunksrcwpincludesclasswalkernavmenuphp"></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-walker-nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-nav-menu.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/class-walker-nav-menu.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param stdClass $args An object of `wp_nav_menu()` arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Depth of menu item. Used for padding.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_names = join( ' ', apply_filters( 'nav_menu_submenu_css_class', $classes, $args, $depth ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_names = implode( ' ', apply_filters( 'nav_menu_submenu_css_class', $classes, $args, $depth ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "{$n}{$indent}<ul$class_names>{$n}";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,7 +150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param stdClass $args An object of wp_nav_menu() arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $depth Depth of menu item. Used for padding.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class_names = join( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_names = implode( ' ', apply_filters( 'nav_menu_css_class', array_filter( $classes ), $item, $args, $depth ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $class_names = $class_names ? ' class="' . esc_attr( $class_names ) . '"' : '';
</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="trunksrcwpincludesclasswpcustomizemanagerphp"></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-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2397,7 +2397,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notification = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $validity->errors as $error_code => $error_messages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $notification[ $error_code ] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'message' => join( ' ', $error_messages ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'message' => implode( ' ', $error_messages ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'data' => $validity->get_error_data( $error_code ),
</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="trunksrcwpincludesclasswpqueryphp"></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-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/class-wp-query.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2420,10 +2420,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $in_search_post_types ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= ' AND 1=0 ';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type IN ('" . implode( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $post_type ) && is_array( $post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", esc_sql( $post_type ) ) . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where .= " AND {$wpdb->posts}.post_type IN ('" . implode( "', '", esc_sql( $post_type ) ) . "')";
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $post_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2485,20 +2485,20 @@
</span><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"> if ( ! empty( $e_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = '(' . join( ' AND ', $e_status ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = '(' . implode( ' AND ', $e_status ) . ')';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['perm'] ) && 'editable' === $q['perm'] && ! current_user_can( $edit_others_cap ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $r_status ) . '))';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . implode( ' OR ', $r_status ) . '))';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = '(' . join( ' OR ', $r_status ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = '(' . implode( ' OR ', $r_status ) . ')';
</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"> if ( ! empty( $p_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $q['perm'] ) && 'readable' === $q['perm'] && ! current_user_can( $read_private_cap ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $p_status ) . '))';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . implode( ' OR ', $p_status ) . '))';
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $statuswheres[] = '(' . join( ' OR ', $p_status ) . ')';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $statuswheres[] = '(' . implode( ' OR ', $p_status ) . ')';
</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"> if ( $post_status_join ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2669,7 +2669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ids[] = (int) $comment->comment_post_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">- $post_ids = join( ',', $post_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ids = implode( ',', $post_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> $join = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where = "AND {$wpdb->posts}.ID IN ($post_ids) ";
</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 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,7 +274,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If they're too different, don't include any <ins> or <del>'s.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Length of all text between <ins> or <del>.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $stripped_matches = strlen( strip_tags( join( ' ', $diff_matches[0] ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stripped_matches = strlen( strip_tags( implode( ' ', $diff_matches[0] ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Since we count length of text between <ins> or <del> (instead of picking just one),
</span><span class="cx" style="display: block; padding: 0 10px"> // we double the length of chars not in those tags.
</span><span class="cx" style="display: block; padding: 0 10px"> $stripped_diff = strlen( strip_tags( $diff ) ) * 2 - $stripped_matches;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserqueryphp"></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-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/class-wp-user-query.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><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"> $posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ', ', $post_types ) . ' ) )';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . implode( ', ', $post_types ) . ' ) )';
</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"> // nicename
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/comment-template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Separates classes with a single space, collates classes for comment DIV.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = 'class="' . implode( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $class;
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/comment.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3235,7 +3235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $non_cached_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_comment_cache( $fresh_comments, $update_meta_cache );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></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/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/compat.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's anything left over, repeat the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> } while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return join( '', array_slice( $chars, $start, $length ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( '', array_slice( $chars, $start, $length ) );
</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"> if ( ! function_exists( 'mb_strlen' ) ) :
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></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/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/embed.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $handler Audio embed handler callback function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . join( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_embed_register_handler( 'audio', '#^https?://.+?\.(' . implode( '|', wp_get_audio_extensions() ) . ')$#i', apply_filters( 'wp_audio_embed_handler', 'wp_embed_handler_audio' ), 9999 );
</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"> * Filters the video embed handler callback.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,7 +213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param callable $handler Video embed handler callback function.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_embed_register_handler( 'video', '#^https?://.+?\.(' . join( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_embed_register_handler( 'video', '#^https?://.+?\.(' . implode( '|', wp_get_video_extensions() ) . ')$#i', apply_filters( 'wp_video_embed_handler', 'wp_embed_handler_video' ), 9999 );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,7 +841,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $attrs['title'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $attrs['title'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attr_string = join( ' ', wp_list_pluck( $attrs, 'whole' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attr_string = implode( ' ', wp_list_pluck( $attrs, 'whole' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = str_replace( $matches[0], '<iframe ' . trim( $attr_string ) . '>', $result );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return str_ireplace( '<iframe ', sprintf( '<iframe title="%s" ', esc_attr( $title ) ), $result );
</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 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/formatting.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +722,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The regular expression
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_wptexturize_shortcode_regex( $tagnames ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tagregexp = implode( '|', array_map( 'preg_quote', $tagnames ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound -- don't remove regex indentation
</span><span class="cx" style="display: block; padding: 0 10px"> $regex =
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $pee;
</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">- $tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tagregexp = implode( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $spaces = wp_spaces_regexp();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:disable Squiz.Strings.ConcatenationSpacing.PaddingFound,WordPress.WhiteSpace.PrecisionAlignment.Found -- don't remove regex indentation
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3232,7 +3232,7 @@
</span><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"> $atts['rel']['whole'] = 'rel="' . esc_attr( $rel ) . '"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_html = join( ' ', array_column( $atts, 'whole' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_html = implode( ' ', array_column( $atts, 'whole' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_escaped ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_html = preg_replace( '/[\'"]/', '\\\\$0', $link_html );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3696,7 +3696,7 @@
</span><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"> // Join valid subs into the new domain.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain = join( '.', $new_subs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain = implode( '.', $new_subs );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put the email back together.
</span><span class="cx" style="display: block; padding: 0 10px"> $sanitized_email = $local . '@' . $domain;
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/functions.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@
</span><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"> foreach ( $quant as $unit => $mag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( doubleval( $bytes ) >= $mag ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (float) $bytes >= $mag ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
</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">@@ -3431,7 +3431,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( $message ),
</span><span class="cx" style="display: block; padding: 0 10px"> wp_list_pluck( $parsed_args['additional_errors'], 'message' )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = "<ul>\n\t\t<li>" . implode( "</li>\n\t\t<li>", $message ) . "</li>\n\t</ul>";
</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"> $message = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5880,7 +5880,7 @@
</span><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"> // Build the value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value = join( '/', $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = implode( '/', $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> $selected = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value === $selected_zone ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $selected = 'selected="selected" ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5981,7 +5981,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $structure[] = '</optgroup>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return join( "\n", $structure );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( "\n", $structure );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6419,7 +6419,7 @@
</span><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"> if ( $pretty ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return join( ', ', array_reverse( $caller ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( ', ', array_reverse( $caller ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $caller;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/general-template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4345,12 +4345,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'list':
</span><span class="cx" style="display: block; padding: 0 10px"> $r .= "<ul class='page-numbers'>\n\t<li>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r .= join( "</li>\n\t<li>", $page_links );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r .= implode( "</li>\n\t<li>", $page_links );
</ins><span class="cx" style="display: block; padding: 0 10px"> $r .= "</li>\n</ul>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = join( "\n", $page_links );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = implode( "\n", $page_links );
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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="trunksrcwpincludesl10nphp"></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/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/l10n.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1617,7 +1617,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Combine the output string.
</span><span class="cx" style="display: block; padding: 0 10px"> $output = sprintf( '<select name="%s" id="%s">', esc_attr( $parsed_args['name'] ), esc_attr( $parsed_args['id'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $output .= join( "\n", $structure );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output .= implode( "\n", $structure );
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '</select>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['echo'] ) {
</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 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/media.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1035,7 +1035,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $size_class = $size;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $size_class ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_class = join( 'x', $size_class );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_class = implode( 'x', $size_class );
</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"> $default_attr = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2950,7 +2950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\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">- $html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html .= sprintf( '<audio %s controls="controls">', implode( ' ', $attr_strings ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fileurl = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $source = '<source type="%s" src="%s" />';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3218,7 +3218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\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">- $html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $html .= sprintf( '<video %s controls="controls">', implode( ' ', $attr_strings ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $fileurl = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $source = '<source type="%s" src="%s" />';
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/meta.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,7 +1055,7 @@
</span><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"> // Get meta info.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_list = join( ',', $non_cached_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_list = implode( ',', $non_cached_ids );
</ins><span class="cx" style="display: block; padding: 0 10px"> $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
</span></span></pre></div>
<a id="trunksrcwpincludesmsnetworkphp"></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/ms-network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-network.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/ms-network.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $non_cached_ids = _get_non_cached_ids( $network_ids, 'networks' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $non_cached_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fresh_networks = $wpdb->get_results( sprintf( "SELECT $wpdb->site.* FROM $wpdb->site WHERE id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_network_cache( $fresh_networks );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmssitephp"></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/ms-site.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-site.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/ms-site.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $non_cached_ids = _get_non_cached_ids( $ids, 'sites' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $non_cached_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fresh_sites = $wpdb->get_results( sprintf( "SELECT * FROM $wpdb->blogs WHERE blog_id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_cache( $fresh_sites, $update_meta_cache );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></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/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/pluggable.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2723,7 +2723,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $args['alt'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $url ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( $url2x ) . ' 2x',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- esc_attr( join( ' ', $class ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ esc_attr( implode( ' ', $class ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> (int) $args['height'],
</span><span class="cx" style="display: block; padding: 0 10px"> (int) $args['width'],
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_attr
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></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/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/post-template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function post_class( $class = '', $post_id = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Separates classes with a single space, collates classes for post DIV.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo 'class="' . esc_attr( join( ' ', get_post_class( $class, $post_id ) ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo 'class="' . esc_attr( implode( ' ', get_post_class( $class, $post_id ) ) ) . '"';
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -592,7 +592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function body_class( $class = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Separates class names with a single space, collates class names for body element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo 'class="' . esc_attr( join( ' ', get_body_class( $class ) ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo 'class="' . esc_attr( implode( ' ', get_body_class( $class ) ) ) . '"';
</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>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/post.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2955,7 +2955,7 @@
</span><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"> if ( ! empty( $wheres ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $where = ' AND (' . join( ' OR ', $wheres ) . ') ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $where = ' AND (' . implode( ' OR ', $wheres ) . ') ';
</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"> return $where;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7466,7 +7466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $non_cached_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ',', $non_cached_ids ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", implode( ',', $non_cached_ids ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></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/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/shortcodes.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -252,7 +252,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $tagnames ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tagnames = array_keys( $shortcode_tags );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tagregexp = implode( '|', array_map( 'preg_quote', $tagnames ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag().
</span><span class="cx" style="display: block; padding: 0 10px"> // Also, see shortcode_unautop() and shortcode.js.
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/taxonomy.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2708,7 +2708,7 @@
</span><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"> if ( $values ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . ' ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . implode( ',', $values ) . ' ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database.' ), $wpdb->last_error );
</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">@@ -4058,7 +4058,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $non_cached_ids = _get_non_cached_ids( $term_ids, 'terms' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $non_cached_ids ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", join( ',', array_map( 'intval', $non_cached_ids ) ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fresh_terms = $wpdb->get_results( sprintf( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE t.term_id IN (%s)", implode( ',', array_map( 'intval', $non_cached_ids ) ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_term_cache( $fresh_terms, $update_meta_cache );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4708,7 +4708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $parsed_args['before'] . join( $parsed_args['sep'], get_the_taxonomies( $parsed_args['post'], $parsed_args ) ) . $parsed_args['after'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $parsed_args['before'] . implode( $parsed_args['sep'], get_the_taxonomies( $parsed_args['post'], $parsed_args ) ) . $parsed_args['after'];
</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>
<a id="trunksrcwpincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/theme.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2149,7 +2149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'text',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => _x( 'Find Us', 'Theme starter content' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'text' => join(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'text' => implode(
</ins><span class="cx" style="display: block; padding: 0 10px"> '',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> '<strong>' . _x( 'Address', 'Theme starter content' ) . "</strong>\n",
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetcustomhtmlphp"></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/widgets/class-wp-widget-custom-html.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-custom-html.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/widgets/class-wp-widget-custom-html.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.codeEditorDisabled ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Some HTML tags are not permitted, including:' ); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <code><?php echo join( '</code>, <code>', $disallowed_html ); ?></code>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <code><?php echo implode( '</code>, <code>', $disallowed_html ); ?></code>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></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/widgets/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,7 +219,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $width = empty( $caption_size[0] ) ? 0 : $caption_size[0];
</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">- $image_attributes['class'] .= sprintf( ' attachment-%1$s size-%1$s', is_array( $size ) ? join( 'x', $size ) : $size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_attributes['class'] .= sprintf( ' attachment-%1$s size-%1$s', is_array( $size ) ? implode( 'x', $size ) : $size );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_attachment_image( $attachment->ID, $size, false, $image_attributes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaphp"></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/widgets/class-wp-widget-media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,7 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $tokens = array_map( 'sanitize_html_class', $tokens );
</span><span class="cx" style="display: block; padding: 0 10px"> $tokens = array_filter( $tokens );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return join( ' ', $tokens );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( ' ', $tokens );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class="media-widget-instance-property"
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $this->get_field_name( $name ) ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> id="<?php echo esc_attr( $this->get_field_id( $name ) ); // Needed specifically by wpWidgets.appendTitle(). ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- value="<?php echo esc_attr( is_array( $value ) ? join( ',', $value ) : (string) $value ); ?>"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ value="<?php echo esc_attr( is_array( $value ) ? implode( ',', $value ) : (string) $value ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/includes/utils.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return trim( join( "\n", $result ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return trim( implode( "\n", $result ) );
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $a[] = $k . '="' . $v . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return join( ' ', $a );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( ' ', $a );
</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"> function xml_array_dumbdown( &$data ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out[] = gen_tests_array( "{$name}[{$index}]", $v );
</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">- return join( "\n", $out ) . "\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return implode( "\n", $out ) . "\n";
</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>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/customize/manager.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2719,7 +2719,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $error->errors as $code => $messages ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( $code, $validity );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInternalType( 'array', $validity[ $code ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( join( ' ', $messages ), $validity[ $code ]['message'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( implode( ' ', $messages ), $validity[ $code ]['message'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertArrayHasKey( 'data', $validity[ $code ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $validity[ $code ]['data'], $error->get_error_data( $code ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/db.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -489,7 +489,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $str = $wpdb->get_caller();
</span><span class="cx" style="display: block; padding: 0 10px"> $calls = explode( ', ', $str );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $called = join( '->', array( __CLASS__, __FUNCTION__ ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $called = implode( '->', array( __CLASS__, __FUNCTION__ ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $called, end( $calls ) );
</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="trunktestsphpunittestsformattingAutopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/formatting/Autop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/formatting/Autop.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/formatting/Autop.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,12 +337,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content[] = "<$block>foo</$block>";
</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">- $expected = join( "\n", $content );
- $input = join( "\n\n", $content ); // Whitespace difference.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = implode( "\n", $content );
+ $input = implode( "\n\n", $content ); // Whitespace difference.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, trim( wpautop( $input ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $input = join( '', $content ); // Whitespace difference.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $input = implode( '', $content ); // Whitespace difference.
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, trim( wpautop( $input ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,8 +353,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content[] = "<$block/>";
</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">- $expected = join( "\n", $content );
- $input = join( '', $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = implode( "\n", $content );
+ $input = implode( '', $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, trim( wpautop( $input ) ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -365,8 +365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content[] = "<$block attr='value'>foo</$block>";
</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">- $expected = join( "\n", $content );
- $input = join( '', $content );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = implode( "\n", $content );
+ $input = implode( '', $content );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, trim( wpautop( $input ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -426,8 +426,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expected[] = "<p><$inline>foo</$inline></p>";
</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">- $content = join( "\n\n", $content );
- $expected = join( "\n", $expected );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = implode( "\n\n", $content );
+ $expected = implode( "\n", $expected );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $expected, trim( wpautop( $content ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/media.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -512,8 +512,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
</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">- $ids1_joined = join( ',', $ids1 );
- $ids2_joined = join( ',', $ids2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids1_joined = implode( ',', $ids1 );
+ $ids2_joined = implode( ',', $ids2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blob = <<<BLOB
</span><span class="cx" style="display: block; padding: 0 10px"> [gallery ids="$ids1_joined"]
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,8 +662,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ids2_srcs[] = 'http://' . WP_TESTS_DOMAIN . '/wp-content/uploads/' . "image$i.jpg";
</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">- $ids1_joined = join( ',', $ids1 );
- $ids2_joined = join( ',', $ids2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ids1_joined = implode( ',', $ids1 );
+ $ids2_joined = implode( ',', $ids2 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $blob = <<<BLOB
</span><span class="cx" style="display: block; padding: 0 10px"> [gallery ids="$ids1_joined"]
</span></span></pre></div>
<a id="trunktestsphpunittestspostbodyClassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/bodyClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/bodyClass.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/post/bodyClass.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><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"> public function test_body_class() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = 'class="' . join( ' ', get_body_class( '', $this->post_id ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = 'class="' . implode( ' ', get_body_class( '', $this->post_id ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span><span class="cx" style="display: block; padding: 0 10px"> body_class( '', $this->post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_body_class_extra_esc_attr() {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_body_class( '', $this->post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $escaped_again = array_map( 'esc_attr', $classes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $escaped_another_time = 'class="' . esc_attr( join( ' ', $escaped_again ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $escaped_another_time = 'class="' . esc_attr( implode( ' ', $escaped_again ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $escaped_another_time );
</span><span class="cx" style="display: block; padding: 0 10px"> body_class( '', $this->post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestspostpostClassphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/postClass.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/postClass.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/post/postClass.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><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"> public function test_post_class() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $expected = 'class="' . join( ' ', get_post_class( '', $this->post_id ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $expected = 'class="' . implode( ' ', get_post_class( '', $this->post_id ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $expected );
</span><span class="cx" style="display: block; padding: 0 10px"> post_class( '', $this->post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_post_class_extra_esc_attr() {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = get_post_class( '', $this->post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $escaped_again = array_map( 'esc_attr', $classes );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $escaped_another_time = 'class="' . esc_attr( join( ' ', $escaped_again ) ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $escaped_another_time = 'class="' . esc_attr( implode( ' ', $escaped_again ) ) . '"';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( $escaped_another_time );
</span><span class="cx" style="display: block; padding: 0 10px"> post_class( '', $this->post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestsposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post/template.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/post/template.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function test_wp_link_pages() {
</span><span class="cx" style="display: block; padding: 0 10px"> $contents = array( 'One', 'Two', 'Three' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = join( '<!--nextpage-->', $contents );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content = implode( '<!--nextpage-->', $contents );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = self::factory()->post->create( array( 'post_content' => $content ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '?p=' . $post_id );
</span></span></pre></div>
<a id="trunktestsphpunittestswidgetsmediagallerywidgetphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/widgets/media-gallery-widget.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2020-10-18 17:16:33 UTC (rev 49192)
+++ trunk/tests/phpunit/tests/widgets/media-gallery-widget.php 2020-10-18 17:25:10 UTC (rev 49193)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( wp_script_is( 'media-gallery-widget' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $after = join( '', wp_scripts()->registered['media-gallery-widget']->extra['after'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $after = implode( '', wp_scripts()->registered['media-gallery-widget']->extra['after'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'wp.mediaWidgets.modelConstructors[ "media_gallery" ].prototype', $after );
</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>