<!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>[45583] trunk/src/wp-admin: Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in `wp-admin`.</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/45583">45583</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/45583","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2019-07-01 12:50:14 +0000 (Mon, 01 Jul 2019)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Fix the `Squiz.PHP.DisallowMultipleAssignments` violations in `wp-admin`.
See <a href="https://core.trac.wordpress.org/ticket/47632">#47632</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadmincustombackgroundphp">trunk/src/wp-admin/custom-background.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformadvancedphp">trunk/src/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminimportphp">trunk/src/wp-admin/import.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassfileuploadupgraderphp">trunk/src/wp-admin/includes/class-file-upload-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderskinphp">trunk/src/wp-admin/includes/class-theme-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpextphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemftpsocketsphp">trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystemssh2php">trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.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="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-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="#trunksrcwpadminincludesclasswpprivacypolicycontentphp">trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesedittagmessagesphp">trunk/src/wp-admin/includes/edit-tag-messages.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="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludesmsphp">trunk/src/wp-admin/includes/ms.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.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="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemeinstallphp">trunk/src/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminlinkmanagerphp">trunk/src/wp-admin/link-manager.php</a></li>
<li><a href="#trunksrcwpadminlinkphp">trunk/src/wp-admin/link.php</a></li>
<li><a href="#trunksrcwpadminmediaphp">trunk/src/wp-admin/media.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminrevisionphp">trunk/src/wp-admin/revision.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpadminwidgetsphp">trunk/src/wp-admin/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminasyncuploadphp"></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/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/async-upload.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,8 @@
</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"> // just fetch the detail form for that attachment
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $_REQUEST['attachment_id'] ) && ( $id = intval( $_REQUEST['attachment_id'] ) ) && $_REQUEST['fetch'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['attachment_id'] ) && intval( $_REQUEST['attachment_id'] ) && $_REQUEST['fetch'] ) {
+ $id = intval( $_REQUEST['attachment_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' != $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +51,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $_REQUEST['fetch'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 3:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true );
+ if ( $thumb_url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
</span></span></pre></div>
<a id="trunksrcwpadmincommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/comment.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = absint( $_GET['c'] );
</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 ( ! $comment = get_comment( $comment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+ if ( ! $comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'javascript:history.go(-1)' ) );
</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">@@ -88,7 +89,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = absint( $_GET['c'] );
</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 ( ! $comment = get_comment( $comment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+ if ( ! $comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'edit-comments.php?error=1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +262,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $noredir = isset( $_REQUEST['noredir'] );
</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 ( ! $comment = get_comment( $comment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $comment_id );
+ if ( ! $comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Invalid comment ID.' ) . sprintf( ' <a href="%s">' . __( 'Go back' ) . '</a>.', 'edit-comments.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmincustombackgroundphp"></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/custom-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/custom-background.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/custom-background.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> call_user_func( $this->admin_image_div_callback );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $background_styles = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $bgcolor = get_background_color() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bgcolor = get_background_color();
+ if ( $bgcolor ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $background_styles .= 'background-color: #' . $bgcolor . ';';
</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="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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/edit-comments.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</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">- $approved = $unapproved = $spammed = $unspammed = $trashed = $untrashed = $deleted = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $approved = 0;
+ $unapproved = 0;
+ $spammed = 0;
+ $unspammed = 0;
+ $trashed = 0;
+ $untrashed = 0;
+ $deleted = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'spammed', 'unspammed', 'approved', 'unapproved', 'ids' ), wp_get_referer() );
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = add_query_arg( 'paged', $pagenum, $redirect_to );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,17 +313,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages[] = sprintf( _n( '%s comment permanently deleted', '%s comments permanently deleted', $deleted ), $deleted );
</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 ( $same > 0 && $comment = get_comment( $same ) ) {
- switch ( $comment->comment_approved ) {
- case '1':
- $messages[] = __( 'This comment is already approved.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
- break;
- case 'trash':
- $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
- break;
- case 'spam':
- $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $same > 0 ) {
+ $comment = get_comment( $same );
+ if ( $comment ) {
+ switch ( $comment->comment_approved ) {
+ case '1':
+ $messages[] = __( 'This comment is already approved.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+ break;
+ case 'trash':
+ $messages[] = __( 'This comment is already in the Trash.' ) . ' <a href="' . esc_url( admin_url( 'edit-comments.php?comment_status=trash' ) ) . '"> ' . __( 'View Trash' ) . '</a>';
+ break;
+ case 'spam':
+ $messages[] = __( 'This comment is already marked as spam.' ) . ' <a href="' . esc_url( admin_url( "comment.php?action=editcomment&c=$same" ) ) . '">' . __( 'Edit comment' ) . '</a>';
+ break;
+ }
</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="trunksrcwpadmineditformadvancedphp"></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-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/edit-form-advanced.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,8 +40,10 @@
</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"> wp_enqueue_script( 'post' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$_wp_editor_expand = $_content_editor_dfw = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$_wp_editor_expand = false;
+$_content_editor_dfw = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to enable the 'expand' functionality in the post editor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,9 +108,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = '';
-$preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$preview_post_link_html = '';
+$scheduled_post_link_html = '';
+$view_post_link_html = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$preview_page_link_html = '';
+$scheduled_page_link_html = '';
+$view_page_link_html = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_url = get_preview_post_link( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $viewable = is_post_type_viewable( $post_type_object );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'auto-draft' != $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span id="last-edit">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) );
+ if ( $last_user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Name of most recent post author, 2: Post edited date, 3: Post edited time */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/edit.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'trash':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $trashed = $locked = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $trashed = 0;
+ $locked = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_ids as $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_post', $post_id ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/import.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/import.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,8 @@
</span><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"> foreach ( $importers as $importer_id => $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_slug = $action = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_slug = '';
+ $action = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_plugin_installed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $data['install'] ) ) {
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,7 +669,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_delete_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment = get_comment( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $id );
+ if ( ! $comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -778,7 +779,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "delete-meta_$id" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $meta = get_metadata_by_mid( 'post', $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_metadata_by_mid( 'post', $id );
+ if ( ! $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</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">@@ -906,7 +908,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_dim_comment() {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment = get_comment( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $id );
+ if ( ! $comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'what' => 'comment',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,7 +1013,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
</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 ( ! $tag || is_wp_error( $tag ) || ( ! $tag = get_term( $tag['term_id'], $taxonomy ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $tag && ! is_wp_error( $tag ) ) {
+ $tag = get_term( $tag['term_id'], $taxonomy );
+ }
+
+ if ( ! $tag || is_wp_error( $tag ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'An error has occurred. Please reload the page and try again.' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $tag ) && $tag->get_error_message() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $tag->get_error_message();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1490,14 +1497,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $x->send();
</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 ( ! $mid = add_meta( $pid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mid = add_meta( $pid );
+ if ( ! $mid ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field value.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! $mid = add_meta( $pid ) ) {
- wp_die( __( 'Please provide a custom field value.' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $mid = add_meta( $pid );
+ if ( ! $mid ) {
+ wp_die( __( 'Please provide a custom field value.' ) );
+ }
</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"> $meta = get_metadata_by_mid( 'post', $mid );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1519,7 +1530,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == trim( $key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field name.' ) );
</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 ( ! $meta = get_metadata_by_mid( 'post', $mid ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_metadata_by_mid( 'post', $mid );
+ if ( ! $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 ); // if meta doesn't exist
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1528,7 +1540,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $meta->meta_value != $value || $meta->meta_key != $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $u = update_metadata_by_mid( 'post', $mid, $value, $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $u = update_metadata_by_mid( 'post', $mid, $value, $key );
+ if ( ! $u ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 ); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
</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">@@ -1570,7 +1583,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'create_users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</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 ( ! $user_id = edit_user() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = edit_user();
+ if ( ! $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_wp_error( $user_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $x = new WP_Ajax_Response(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1624,7 +1638,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 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">- if ( ! $user = wp_get_current_user() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_get_current_user();
+ if ( ! $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</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">@@ -1653,7 +1668,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 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">- if ( ! $user = wp_get_current_user() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_get_current_user();
+ if ( ! $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</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">@@ -1807,7 +1823,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 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">- if ( ! $user = wp_get_current_user() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_get_current_user();
+ if ( ! $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</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">@@ -1875,10 +1892,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
</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 ( ! isset( $_POST['post_ID'] ) || ! ( $post_ID = (int) $_POST['post_ID'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['post_ID'] ) || ! (int) $_POST['post_ID'] ) {
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID = (int) $_POST['post_ID'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $_POST['post_type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_page', $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1889,7 +1908,8 @@
</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 ( $last = wp_check_post_lock( $post_ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last = wp_check_post_lock( $post_ID );
+ if ( $last ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1991,10 +2011,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 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">- if ( ! isset( $_POST['tax_ID'] ) || ! ( $id = (int) $_POST['tax_ID'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['tax_ID'] ) || ! (int) $_POST['tax_ID'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = (int) $_POST['tax_ID'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_term', $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2236,7 +2258,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $form = $wp_registered_widget_controls[ $widget_id ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $form = $wp_registered_widget_controls[ $widget_id ];
+ if ( $form ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> call_user_func_array( $form['callback'], $form['params'] );
</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">@@ -2388,7 +2411,8 @@
</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 ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = wp_prepare_attachment_for_js( $attachment_id );
+ if ( ! $attachment ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2598,7 +2622,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_time = date_i18n( __( 'g:i a' ) );
</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 ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_id = get_post_meta( $post_id, '_edit_last', true );
+ if ( $last_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_user = get_userdata( $last_id );
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: display_name of last user, 2: date of last edit, 3: time of last edit. */
</span><span class="cx" style="display: block; padding: 0 10px"> $last_edited = sprintf( __( 'Last edited by %1$s on %2$s at %3$s' ), esc_html( $last_user->display_name ), $last_date, $last_time );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2620,7 +2645,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $_POST['post_ID'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</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">@@ -2684,11 +2710,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $id = absint( $_REQUEST['id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = absint( $_REQUEST['id'] );
+ if ( ! $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $post = get_post( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $id );
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2700,7 +2728,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = wp_prepare_attachment_for_js( $id );
+ if ( ! $attachment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2786,7 +2815,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $id = absint( $_REQUEST['id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = absint( $_REQUEST['id'] );
+ if ( ! $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2869,7 +2899,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $id = absint( $_REQUEST['id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = absint( $_REQUEST['id'] );
+ if ( ! $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2906,7 +2937,8 @@
</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 ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = wp_prepare_attachment_for_js( $id );
+ if ( ! $attachment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2923,7 +2955,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $post_id = absint( $_REQUEST['post_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = absint( $_REQUEST['post_id'] );
+ if ( ! $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2943,7 +2976,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( ! $attachment = get_post( $attachment_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment = get_post( $attachment_id );
+ if ( ! $attachment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' != $attachment->post_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2977,7 +3011,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $attachment['id'] );
</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 ( ! $post = get_post( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $id );
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -2987,7 +3022,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If this attachment is unattached, attach it. Primarily a back compat thing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == $post->post_parent && $insert_into_post_id = intval( $_POST['post_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $insert_into_post_id = intval( $_POST['post_id'] );
+ if ( 0 == $post->post_parent && $insert_into_post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3052,7 +3088,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'media-send-to-editor', 'nonce' );
</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 ( ! $src = wp_unslash( $_POST['src'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $src = wp_unslash( $_POST['src'] );
+ if ( ! $src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -3060,11 +3097,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $src = 'http://' . $src;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $src = esc_url_raw( $src ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $src = esc_url_raw( $src );
+ if ( ! $src ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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 ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_text = trim( wp_unslash( $_POST['link_text'] ) );
+ if ( ! $link_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_text = wp_basename( $src );
</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">@@ -3087,9 +3126,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Figure out what filter to run:
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'file';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
- && ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+ if ( $ext ) {
+ $ext_type = wp_ext2type( $ext );
+ if ( 'audio' == $ext_type || 'video' == $ext_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $ext_type;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3110,7 +3152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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">- $response = $data = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = array();
+ $data = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // screen_id is the same as $current_screen->id and the JS global 'pagenow'.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3192,7 +3235,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_get_revision_diffs() {
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . 'wp-admin/includes/revision.php';
</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 ( ! $post = get_post( (int) $_REQUEST['post_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( (int) $_REQUEST['post_id'] );
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_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">@@ -3201,7 +3245,8 @@
</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"> // Really just pre-loading the cache here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) );
+ if ( ! $revisions ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</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="trunksrcwpadminincludesclasscoreupgraderphp"></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-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,14 +284,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_AUTO_UPDATE_CORE' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === WP_AUTO_UPDATE_CORE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Defaults to turned off, unless a filter allows it
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_dev = $upgrade_minor = $upgrade_major = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_dev = false;
+ $upgrade_minor = false;
+ $upgrade_major = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( true === WP_AUTO_UPDATE_CORE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // ALL updates for core
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_dev = $upgrade_minor = $upgrade_major = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_dev = true;
+ $upgrade_minor = true;
+ $upgrade_major = true;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'minor' === WP_AUTO_UPDATE_CORE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only minor updates for core
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_dev = $upgrade_major = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_dev = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $upgrade_minor = true;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_major = false;
</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="trunksrcwpadminincludesclassfileuploadupgraderphp"></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-file-upload-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-file-upload-upgrader.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-file-upload-upgrader.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->package = get_attached_file( $attachment->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Else, It's set to something, Back compat for plugins using the old (pre-3.3) File_Uploader handler.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( ( $uploads = wp_upload_dir() ) && false === $uploads['error'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads = wp_upload_dir();
+ if ( ! ( $uploads && false === $uploads['error'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( $uploads['error'] );
</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="trunksrcwpadminincludesclasslanguagepackupgraderphp"></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-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $files = $wp_filesystem->dirlist( $remote_source );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to see if a .po and .mo exist in the folder.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $po = $mo = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $po = false;
+ $mo = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $files as $file => $filedata ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.po' == substr( $file, -3 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $po = true;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderskinphp"></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-theme-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-theme-upgrader-skin.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->decrement_update_count( 'theme' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $update_actions = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $this->upgrader->result['destination_name'] ) && $theme_info = $this->upgrader->theme_info() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme_info = $this->upgrader->theme_info();
+ if ( $theme_info ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = $theme_info->display( 'Name' );
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = $this->upgrader->result['destination_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> $template = $theme_info->get_template();
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpautomaticupdaterphp"></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-automatic-updater.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Search all directories we've found for evidence of version control.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vcs_dirs as $vcs_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $check_dirs as $check_dir ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checkout = @is_dir( rtrim( $check_dir, '\\/' ) . "/$vcs_dir" );
+ if ( $checkout ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break 2;
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,8 +819,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->pending_count[ $post->ID ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pending_comments = $this->pending_count[ $post->ID ];
</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">- $_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
- $pending_comments = $this->pending_count[ $post->ID ] = $_pending_count_temp[ $post->ID ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_pending_count_temp = get_pending_comments_num( array( $post->ID ) );
+ $pending_comments = $_pending_count_temp[ $post->ID ];
+ $this->pending_count[ $post->ID ] = $pending_comments;
</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 ( current_user_can( 'edit_post', $post->ID ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,8 +832,11 @@
</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"> echo '<div class="response-links">';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' === $post->post_type && ( $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true ) ) ) {
- echo $thumb;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post->post_type ) {
+ $thumb = wp_get_attachment_image( $post->ID, array( 80, 60 ), true );
+ if ( $thumb ) {
+ echo $thumb;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo $post_link;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post->post_type );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></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-filesystem-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +224,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache[ $folder ] = $folder;
</span><span class="cx" style="display: block; padding: 0 10px"> return $folder;
</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 ( $return = $this->search_for_folder( $folder ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return = $this->search_for_folder( $folder );
+ if ( $return ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->cache[ $folder ] = $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -284,7 +285,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only search for the remaining path tokens in the directory, not the full path again.
</span><span class="cx" style="display: block; padding: 0 10px"> $newfolder = implode( '/', array_slice( $folder_parts, $index + 1 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ret = $this->search_for_folder( $newfolder, $newdir, $loop ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ret = $this->search_for_folder( $newfolder, $newdir, $loop );
+ if ( $ret ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $ret;
</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">@@ -398,7 +400,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attarray = preg_split( '//', $mode );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $c = count( $attarray ); $i < $c; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key = array_search( $attarray[ $i ], $legal ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_search( $attarray[ $i ], $legal );
+ if ( $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $realmode .= $legal[ $key ];
</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="trunksrcwpadminincludesclasswpfilesystemftpextphp"></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-filesystem-ftpext.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,47 +590,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b['time'] = @mktime( $lucifer[4] + ( strcasecmp( $lucifer[6], 'PM' ) == 0 ? 12 : 0 ), $lucifer[5], 0, $lucifer[1], $lucifer[2], $lucifer[3] );
</span><span class="cx" style="display: block; padding: 0 10px"> $b['am/pm'] = $lucifer[6];
</span><span class="cx" style="display: block; padding: 0 10px"> $b['name'] = $lucifer[8];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! $is_windows && $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY ) ) {
- //echo $line."\n";
- $lcount = count( $lucifer );
- if ( $lcount < 8 ) {
- return '';
- }
- $b = array();
- $b['isdir'] = $lucifer[0]{0} === 'd';
- $b['islink'] = $lucifer[0]{0} === 'l';
- if ( $b['isdir'] ) {
- $b['type'] = 'd';
- } elseif ( $b['islink'] ) {
- $b['type'] = 'l';
- } else {
- $b['type'] = 'f';
- }
- $b['perms'] = $lucifer[0];
- $b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
- $b['number'] = $lucifer[1];
- $b['owner'] = $lucifer[2];
- $b['group'] = $lucifer[3];
- $b['size'] = $lucifer[4];
- if ( $lcount == 8 ) {
- sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
- sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
- $b['time'] = @mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
- $b['name'] = $lucifer[7];
- } else {
- $b['month'] = $lucifer[5];
- $b['day'] = $lucifer[6];
- if ( preg_match( '/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2 ) ) {
- $b['year'] = gmdate( 'Y' );
- $b['hour'] = $l2[1];
- $b['minute'] = $l2[2];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $is_windows ) {
+ $lucifer = preg_split( '/[ ]/', $line, 9, PREG_SPLIT_NO_EMPTY );
+ if ( $lucifer ) {
+ //echo $line."\n";
+ $lcount = count( $lucifer );
+ if ( $lcount < 8 ) {
+ return '';
+ }
+ $b = array();
+ $b['isdir'] = $lucifer[0]{0} === 'd';
+ $b['islink'] = $lucifer[0]{0} === 'l';
+ if ( $b['isdir'] ) {
+ $b['type'] = 'd';
+ } elseif ( $b['islink'] ) {
+ $b['type'] = 'l';
</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">- $b['year'] = $lucifer[7];
- $b['hour'] = 0;
- $b['minute'] = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b['type'] = 'f';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $b['time'] = strtotime( sprintf( '%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute'] ) );
- $b['name'] = $lucifer[8];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b['perms'] = $lucifer[0];
+ $b['permsn'] = $this->getnumchmodfromh( $b['perms'] );
+ $b['number'] = $lucifer[1];
+ $b['owner'] = $lucifer[2];
+ $b['group'] = $lucifer[3];
+ $b['size'] = $lucifer[4];
+ if ( $lcount == 8 ) {
+ sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
+ sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
+ $b['time'] = @mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
+ $b['name'] = $lucifer[7];
+ } else {
+ $b['month'] = $lucifer[5];
+ $b['day'] = $lucifer[6];
+ if ( preg_match( '/([0-9]{2}):([0-9]{2})/', $lucifer[7], $l2 ) ) {
+ $b['year'] = gmdate( 'Y' );
+ $b['hour'] = $l2[1];
+ $b['minute'] = $l2[2];
+ } else {
+ $b['year'] = $lucifer[7];
+ $b['hour'] = 0;
+ $b['minute'] = 0;
+ }
+ $b['time'] = strtotime( sprintf( '%d %s %d %02d:%02d', $b['day'], $b['month'], $b['year'], $b['hour'], $b['minute'] ) );
+ $b['name'] = $lucifer[8];
+ }
</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="trunksrcwpadminincludesclasswpfilesystemftpsocketsphp"></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-filesystem-ftpsockets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp = wp_tempnam( $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 ( ! $temphandle = fopen( $temp, 'w+' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $temphandle = fopen( $temp, 'w+' );
+ if ( ! $temphandle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( $temp );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -190,8 +191,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function put_contents( $file, $contents, $mode = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $temp = wp_tempnam( $file );
- if ( ! $temphandle = @fopen( $temp, 'w+' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $temp = wp_tempnam( $file );
+ $temphandle = @fopen( $temp, 'w+' );
+ if ( ! $temphandle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( $temp );
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemssh2php"></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-filesystem-ssh2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( $stream = ssh2_exec( $this->link, $command ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $stream = ssh2_exec( $this->link, $command );
+ if ( ! $stream ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->errors->add(
</span><span class="cx" style="display: block; padding: 0 10px"> 'command',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: command */
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,8 +130,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $blog_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = (int) $blog_id;
</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">- $blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
- if ( ( ! $parsed = parse_url( $blog ) ) || empty( $parsed['host'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $blog = 'http://' . preg_replace( '#^https?://#', '', $blog_id );
+ $parsed = parse_url( $blog );
+ if ( ! $parsed || empty( $parsed['host'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> fwrite( STDERR, "Error: can not determine blog_id from $blog_id\n" );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,7 +804,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_pages_before = '<span class="paging-input">';
</span><span class="cx" style="display: block; padding: 0 10px"> $total_pages_after = '</span></span>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $disable_first = $disable_last = $disable_prev = $disable_next = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $disable_first = false;
+ $disable_last = false;
+ $disable_prev = false;
+ $disable_next = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current == 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $disable_first = true;
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +377,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = _draft_or_post_title();
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb = wp_get_attachment_image( $post->ID, array( 60, 60 ), true, array( 'alt' => '' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link_start = $link_end = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link_start = '';
+ $link_end = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $post->ID ) && ! $this->is_trash ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_start = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -452,7 +453,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $m_time = $post->post_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $time = get_post_time( 'G', true, $post, false );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( abs( $t_diff = time() - $time ) ) < DAY_IN_SECONDS ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t_diff = time() - $time;
+ if ( ( abs( $t_diff ) ) < DAY_IN_SECONDS ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $t_diff < 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $h_time = sprintf( __( '%s from now' ), human_time_diff( $time ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></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-ms-sites-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-ms-sites-list-table.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,10 +93,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $s && wp_is_large_network() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_REQUEST['orderby'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET['orderby'] = $_REQUEST['orderby'] = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET['orderby'] = '';
+ $_REQUEST['orderby'] = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_REQUEST['order'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET['order'] = $_REQUEST['order'] = 'DESC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET['order'] = 'DESC';
+ $_REQUEST['order'] = 'DESC';
</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="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></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-ms-themes-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-ms-themes-list-table.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_where = 'network';
</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">- $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current = get_site_transient( 'update_themes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_site_transient( 'update_themes' );
+ $maybe_update = current_user_can( 'update_themes' ) && ! $this->is_site_themes && $current;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $themes['all'] as $key => $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_themes && $theme->is_allowed( 'network' ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></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-ms-users-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-ms-users-list-table.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,10 +65,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $usersearch && wp_is_large_network( 'users' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_REQUEST['orderby'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET['orderby'] = $_REQUEST['orderby'] = 'id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET['orderby'] = 'id';
+ $_REQUEST['orderby'] = 'id';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_REQUEST['order'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_GET['order'] = $_REQUEST['order'] = 'DESC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_GET['order'] = 'DESC';
+ $_REQUEST['order'] = 'DESC';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $args['count_total'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +473,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 ( current_user_can( 'delete_user', $user->ID ) && ! in_array( $user->user_login, $super_admins ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $actions['delete'] = '<a href="' . $delete = esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</a>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $actions['delete'] = '<a href="' . esc_url( network_admin_url( add_query_arg( '_wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), wp_nonce_url( 'users.php', 'deleteuser' ) . '&action=deleteuser&id=' . $user->ID ) ) ) . '" class="delete">' . __( 'Delete' ) . '</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"> /**
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET['author'] = get_current_user_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">- if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sticky_posts = get_option( 'sticky_posts' );
+ if ( 'post' === $post_type && $sticky_posts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +244,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_edit_link( $args, $label, $class = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( $args, 'edit.php' );
</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_html = $aria_current = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class_html = '';
+ $aria_current = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $class ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class_html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' class="%s"',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,7 +997,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locked_avatar = get_avatar( $lock_holder->ID, 18 );
</span><span class="cx" style="display: block; padding: 0 10px"> $locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
</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">- $locked_avatar = $locked_text = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $locked_avatar = '';
+ $locked_text = '';
</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 '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1054,7 +1057,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $mode;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '0000-00-00 00:00:00' === $post->post_date ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $t_time = $h_time = __( 'Unpublished' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $t_time = __( 'Unpublished' );
+ $h_time = $t_time;
</ins><span class="cx" style="display: block; padding: 0 10px"> $time_diff = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1574,7 +1578,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $users_opt['show_option_none'] = __( '— No Change —' );
</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 ( $authors = wp_dropdown_users( $users_opt ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $authors = wp_dropdown_users( $users_opt );
+ if ( $authors ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> $authors_dropdown = '<label class="inline-edit-author">';
</span><span class="cx" style="display: block; padding: 0 10px"> $authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> $authors_dropdown .= $authors;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpprivacypolicycontentphp"></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-privacy-policy-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-privacy-policy-content.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,12 +241,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $new_data['plugin_name'] === $old_data['plugin_name'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The info for the policy was updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $checked[] = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $checked[] = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_name' => $new_data['plugin_name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'policy_text' => $new_data['policy_text'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'updated' => $time,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = $update_cache = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = true;
+ $update_cache = true;
</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 ( $found ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,7 +379,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return_to_top = '<a href="#" class="return-to-top">' . __( '↑ Return to Top' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $content_array as $section ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = $meta = $removed = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = '';
+ $meta = '';
+ $removed = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $section['removed'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = ' text-removed';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpscreenphp"></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-screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-screen.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $hook_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">- $post_type = $taxonomy = null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type = null;
+ $taxonomy = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> $in_admin = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $action = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $is_block_editor = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,7 +1016,10 @@
</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">- $wrapper_start = $wrapper_end = $form_start = $form_end = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wrapper_start = '';
+ $wrapper_end = '';
+ $form_start = '';
+ $form_end = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Output optional wrapper.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $options['wrap'] ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></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-terms-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-terms-list-table.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -226,7 +226,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set variable because $args['number'] can be subsequently overridden.
</span><span class="cx" style="display: block; padding: 0 10px"> $number = $args['number'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['offset'] = $offset = ( $page - 1 ) * $number;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $offset = ( $page - 1 ) * $number;
+ $args['offset'] = $offset;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert it to table rows.
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -233,7 +234,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We'll need the full set of terms then.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $args['number'] = $args['offset'] = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $args['number'] = 0;
+ $args['offset'] = $args['number'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms( $taxonomy, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the page starts in a subtree, print the parents.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $my_parents = $parent_ids = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $my_parents = array();
+ $parent_ids = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $p = $term->parent;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $p ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $my_parent = get_term( $p, $taxonomy );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpthemeslisttablephp"></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-themes-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-themes-list-table.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,15 +208,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $actions['delete'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $screenshot = $theme->get_screenshot();
</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 class="screenshot hide-if-customize">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $screenshot = $theme->get_screenshot() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $screenshot ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo wp_customize_url( $stylesheet ); ?>" class="screenshot load-customize hide-if-no-customize">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $screenshot = $theme->get_screenshot() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $screenshot ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderphp"></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-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +185,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function fs_connect( $directories = array(), $allow_relaxed_file_ownership = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filesystem;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === ( $credentials = $this->skin->request_filesystem_credentials( false, $directories[0], $allow_relaxed_file_ownership ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $credentials = $this->skin->request_filesystem_credentials( false, $directories[0], $allow_relaxed_file_ownership );
+ if ( false === $credentials ) {
</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="trunksrcwpadminincludescommentphp"></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/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/comment.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/comment.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Comment|false Comment if found. False on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_to_edit( $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $comment = get_comment( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment = get_comment( $id );
+ if ( ! $comment ) {
</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="trunksrcwpadminincludesdashboardphp"></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/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/dashboard.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +595,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: post title */
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( sprintf( __( 'Edit “%s”' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $the_content = wp_trim_words( $draft->post_content, $draft_length ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $the_content = wp_trim_words( $draft->post_content, $draft_length );
+ if ( $the_content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . $the_content . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> echo "</li>\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1012,7 +1013,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = get_user_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== ( $output = get_transient( $cache_key ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $output = get_transient( $cache_key );
+ if ( false !== $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo $output;
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1073,7 +1075,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $form_inputs
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $widget_options = get_option( 'dashboard_widget_options' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $widget_options = get_option( 'dashboard_widget_options' );
+ if ( ! $widget_options ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget_options = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1566,7 +1569,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $_SERVER['HTTP_USER_AGENT'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === ( $response = get_site_transient( 'browser_' . $key ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response = get_site_transient( 'browser_' . $key );
+ if ( false === $response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // include an unmodified $wp_version
</span><span class="cx" style="display: block; padding: 0 10px"> include( ABSPATH . WPINC . '/version.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesedittagmessagesphp"></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/edit-tag-messages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/edit-tag-messages.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/edit-tag-messages.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $messages = apply_filters( 'term_updated_messages', $messages );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $message = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['message'] ) && (int) $_REQUEST['message'] ) {
+ $msg = (int) $_REQUEST['message'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $messages[ $taxonomy ][ $msg ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $messages[ $taxonomy ][ $msg ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) {
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/export.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $join = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['category'] && 'post' == $args['content'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $term = term_exists( $args['category'], 'category' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = term_exists( $args['category'], 'category' );
+ if ( $term ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->term_relationships}.term_taxonomy_id = %d", $term['term_taxonomy_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +145,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Get the requested terms ready, empty unless posts filtered by category
</span><span class="cx" style="display: block; padding: 0 10px"> * or all content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cats = $tags = $terms = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cats = array();
+ $tags = array();
+ $terms = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $term ) && $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cat = get_term( $term['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = array( $cat->term_id => $cat );
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/file.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +821,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * A writable uploads dir will pass this test. Again, there's no point
</span><span class="cx" style="display: block; padding: 0 10px"> * overriding this one.
</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 ( ! ( ( $uploads = wp_upload_dir( $time ) ) && false === $uploads['error'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $uploads = wp_upload_dir( $time );
+ if ( ! ( $uploads && false === $uploads['error'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return call_user_func_array( $upload_error_handler, array( &$file, $uploads['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">@@ -1251,7 +1252,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mbstring_binary_safe_encoding();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $skipped_key = $skipped_signature = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $skipped_key = 0;
+ $skipped_signature = 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $signatures as $signature ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $signature_raw = base64_decode( $signature );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1432,7 +1434,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $uncompressed_size = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $z->numFiles; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $info = $z->statIndex( $i ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info = $z->statIndex( $i );
+ if ( ! $info ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
</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">@@ -1447,10 +1450,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $uncompressed_size += $info['size'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dirname = dirname( $info['name'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '/' === substr( $info['name'], -1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Directory.
</span><span class="cx" style="display: block; padding: 0 10px"> $needed_dirs[] = $to . untrailingslashit( $info['name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '.' !== $dirname = dirname( $info['name'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '.' !== $dirname ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Path to a file.
</span><span class="cx" style="display: block; padding: 0 10px"> $needed_dirs[] = $to . untrailingslashit( $dirname );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1496,7 +1501,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $needed_dirs );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $z->numFiles; $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $info = $z->statIndex( $i ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $info = $z->statIndex( $i );
+ if ( ! $info ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
</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">@@ -1829,7 +1835,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $temp_handle ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to determine the file owner of the WordPress files, and that of newly created files
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_file_owner = $temp_file_owner = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_file_owner = false;
+ $temp_file_owner = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'fileowner' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_file_owner = @fileowner( __FILE__ );
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_file_owner = @fileowner( $temp_file_name );
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/image-edit.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -654,11 +654,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return stdClass Image restoration message object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_restore_image( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $meta = wp_get_attachment_metadata( $post_id );
- $file = get_attached_file( $post_id );
- $backup_sizes = $old_backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
- $restored = false;
- $msg = new stdClass;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = wp_get_attachment_metadata( $post_id );
+ $file = get_attached_file( $post_id );
+ $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
+ $old_backup_sizes = $backup_sizes;
+ $restored = false;
+ $msg = new stdClass;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $backup_sizes ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $msg->error = __( 'Cannot load image metadata.' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -747,7 +748,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_additional_image_sizes = wp_get_additional_image_sizes();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return = new stdClass;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $success = $delete = $scaled = $nocrop = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = false;
+ $delete = false;
+ $scaled = false;
+ $nocrop = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $img = wp_get_image_editor( _load_image_to_edit_path( $post_id, 'full' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,7 +878,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return->fh = $meta['height'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'thumbnail' == $target ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sizes = array( 'thumbnail' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $success = $delete = $nocrop = true;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $success = true;
+ $delete = true;
+ $nocrop = true;
</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">@@ -944,7 +950,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = $thumb_url[0];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $file_url = wp_get_attachment_url( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta['sizes']['thumbnail'] ) && $thumb = $meta['sizes']['thumbnail'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta['sizes']['thumbnail'] ) ) {
+ $thumb = $meta['sizes']['thumbnail'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = path_join( dirname( $file_url ), $thumb['file'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = "$file_url?w=128&h=128";
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/media.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function media_handle_upload( $file_id, $post_id, $post_data = array(), $overrides = array( 'test_form' => false ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = current_time( 'mysql' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post = get_post( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+ if ( $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The post date doesn't usually matter for pages, so don't backdate this upload.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $time = $post->post_date;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,13 +370,16 @@
</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"> // Use image exif/iptc data for title and caption defaults if possible.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 0 === strpos( $type, 'image/' ) && $image_meta = wp_read_image_metadata( $file ) ) {
- if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
- $title = $image_meta['title'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 === strpos( $type, 'image/' ) ) {
+ $image_meta = wp_read_image_metadata( $file );
+ if ( $image_meta ) {
+ if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
+ $title = $image_meta['title'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( trim( $image_meta['caption'] ) ) {
- $excerpt = $image_meta['caption'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( trim( $image_meta['caption'] ) ) {
+ $excerpt = $image_meta['caption'];
+ }
</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">@@ -420,7 +424,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $overrides = array( 'test_form' => false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $time = current_time( 'mysql' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post = get_post( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+ if ( $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $post->post_date, 0, 4 ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $time = $post->post_date;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +443,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use image exif/iptc data for title and caption defaults if possible.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $image_meta = wp_read_image_metadata( $file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $image_meta = wp_read_image_metadata( $file );
+ if ( $image_meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( trim( $image_meta['title'] ) && ! is_numeric( sanitize_title( $image_meta['title'] ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $image_meta['title'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +698,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['attachments'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_POST['attachments'] as $attachment_id => $attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post = $_post = get_post( $attachment_id, ARRAY_A );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $attachment_id, ARRAY_A );
+ $_post = $post;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -835,9 +842,12 @@
</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"> $type = 'file';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
- && ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
+ if ( $ext ) {
+ $ext_type = wp_ext2type( $ext );
+ if ( 'audio' == $ext_type || 'video' == $ext_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $ext_type;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</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">@@ -1440,7 +1450,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment->post_status == 'trash' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item = get_media_item( $id, array( 'errors' => isset( $errors[ $id ] ) ? $errors[ $id ] : null ) );
+ if ( $item ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "\n<div id='media-item-$id' class='media-item child-of-$attachment->post_parent preloaded'><div class='progress hidden'><div class='bar'></div></div><div id='media-upload-error-$id' class='hidden'></div><div class='filename hidden'></div>$item\n</div>";
</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">@@ -1462,10 +1473,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_media_item( $attachment_id, $args = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $redir_tab;
</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 ( ( $attachment_id = intval( $attachment_id ) ) && $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true ) ) {
- $thumb_url = $thumb_url[0];
- } else {
- $thumb_url = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumb_url = false;
+ $attachment_id = intval( $attachment_id );
+
+ if ( $attachment_id ) {
+ $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true );
+ if ( $thumb_url ) {
+ $thumb_url = $thumb_url[0];
+ }
</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"> $post = get_post( $attachment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2753,7 +2768,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $view = 'image-only';
</span><span class="cx" style="display: block; padding: 0 10px"> $table_class = '';
</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">- $view = $table_class = 'not-image';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $view = 'not-image';
+ $table_class = $view;
</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 '
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2836,7 +2852,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function media_upload_flash_bypass() {
</span><span class="cx" style="display: block; padding: 0 10px"> $browser_uploader = admin_url( 'media-new.php?browser-uploader' );
</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 ( $post = get_post() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post();
+ if ( $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $browser_uploader .= '&post_id=' . intval( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $GLOBALS['post_ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $browser_uploader .= '&post_id=' . intval( $GLOBALS['post_ID'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2876,7 +2893,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function media_upload_max_image_resize() {
</span><span class="cx" style="display: block; padding: 0 10px"> $checked = get_user_setting( 'upload_resize' ) ? ' checked="true"' : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $a = $end = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $a = '';
+ $end = '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'manage_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $a = '<a href="' . esc_url( admin_url( 'options-media.php' ) ) . '" target="_blank">';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2919,8 +2937,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/image-edit.php';
</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">- $thumb_url = false;
- if ( $attachment_id = intval( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumb_url = false;
+ $attachment_id = intval( $post->ID );
+ if ( $attachment_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
</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">@@ -2937,7 +2956,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_edit_button = "<input type='button' id='imgedit-open-btn-$post->ID' onclick='imageEdit.open( $post->ID, \"$nonce\" )' class='button' value='" . esc_attr__( 'Edit Image' ) . "' /> <span class='spinner'></span>";
</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">- $open_style = $not_open_style = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $open_style = '';
+ $not_open_style = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $open ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $open_style = ' style="display:none"';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3511,7 +3531,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'upload.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $referer = wp_get_referer() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $referer = wp_get_referer();
+ if ( $referer ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $referer, 'upload.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = remove_query_arg( array( 'attached', 'detach' ), $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmenuphp"></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/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/menu.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/menu.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Create list of page plugin hook names.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $menu_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== $pos = strpos( $menu_page[2], '?' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_page[2], '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Handle post_type=post|page|foo pages.
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_name = substr( $menu_page[2], 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> $hook_args = substr( $menu_page[2], $pos + 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -200,9 +201,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_menu_classes( $menu ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first = $lastorder = false;
- $i = 0;
- $mc = count( $menu );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first = false;
+ $lastorder = false;
+ $i = 0;
+ $mc = count( $menu );
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $order => $top ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/misc.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,8 +136,11 @@
</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"> // Split out the existing file into the preceding lines, and those that appear after the marker
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pre_lines = $post_lines = $existing_lines = array();
- $found_marker = $found_end_marker = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pre_lines = array();
+ $post_lines = array();
+ $existing_lines = array();
+ $found_marker = false;
+ $found_end_marker = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $lines as $line ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $found_marker = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +599,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['wp_screen_options'] ) && is_array( $_POST['wp_screen_options'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'screen-options-nonce', 'screenoptionnonce' );
</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 ( ! $user = wp_get_current_user() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = wp_get_current_user();
+ if ( ! $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $option = $_POST['wp_screen_options']['option'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -964,18 +968,24 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists( 'wp-check-locked-posts', $data ) && is_array( $data['wp-check-locked-posts'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $data['wp-check-locked-posts'] as $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post_id = absint( substr( $key, 5 ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = absint( substr( $key, 5 ) );
+ if ( ! $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</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 ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) && current_user_can( 'edit_post', $post_id ) ) {
- $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = wp_check_post_lock( $post_id );
+ if ( $user_id ) {
+ $user = get_userdata( $user_id );
+ if ( $user && current_user_can( 'edit_post', $post_id ) ) {
+ $send = array( 'text' => sprintf( __( '%s is currently editing' ), $user->display_name ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $avatar = get_avatar( $user->ID, 18 ) ) && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
- $send['avatar_src'] = $matches[1];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar = get_avatar( $user->ID, 18 );
+ if ( $avatar && preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
+ $send['avatar_src'] = $matches[1];
+ }
+
+ $checked[ $key ] = $send;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- $checked[ $key ] = $send;
</del><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">@@ -1002,7 +1012,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $received = $data['wp-refresh-post-lock'];
</span><span class="cx" style="display: block; padding: 0 10px"> $send = array();
</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 ( ! $post_id = absint( $received['post_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = absint( $received['post_id'] );
+ if ( ! $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $response;
</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">@@ -1010,12 +1021,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</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 ( ( $user_id = wp_check_post_lock( $post_id ) ) && ( $user = get_userdata( $user_id ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = wp_check_post_lock( $post_id );
+ $user = get_userdata( $user_id );
+ if ( $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => sprintf( __( '%s has taken over and is currently editing.' ), $user->display_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">- if ( $avatar = get_avatar( $user->ID, 64 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar = get_avatar( $user->ID, 64 );
+ if ( $avatar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( "|src='([^']+)'|", $avatar, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error['avatar_src'] = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1023,7 +1037,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $send['lock_error'] = $error;
</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 ( $new_lock = wp_set_post_lock( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $new_lock = wp_set_post_lock( $post_id );
+ if ( $new_lock ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $send['new_lock'] = implode( ':', $new_lock );
</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">@@ -1049,7 +1064,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $received = $data['wp-refresh-post-nonces'];
</span><span class="cx" style="display: block; padding: 0 10px"> $response['wp-refresh-post-nonces'] = array( 'check' => 1 );
</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 ( ! $post_id = absint( $received['post_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = absint( $received['post_id'] );
+ if ( ! $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $response;
</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="trunksrcwpadminincludesmsphp"></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/ms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ms.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/ms.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +367,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function refresh_user_details( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = (int) $id;
</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 ( ! $user = get_userdata( $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = get_userdata( $id );
+ if ( ! $user ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -908,7 +909,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table" role="presentation">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( ( $allusers = (array) $_POST['allusers'] ) as $user_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allusers = (array) $_POST['allusers'];
+ foreach ( $allusers as $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id != '' && $user_id != '0' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></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/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/nav-menu.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -411,7 +411,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce',
</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">- $most_recent_url = $view_all_url = $search_url = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_recent_url = '';
+ $view_all_url = '';
+ $search_url = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menu_selected_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $most_recent_url = esc_url( add_query_arg( $post_type_name . '-tab', 'most-recent', remove_query_arg( $removed_args ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $view_all_url = esc_url( add_query_arg( $post_type_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +742,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_wpnonce',
</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">- $most_used_url = $view_all_url = $search_url = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_used_url = '';
+ $view_all_url = '';
+ $search_url = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menu_selected_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $most_used_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'most-used', remove_query_arg( $removed_args ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $view_all_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1027,7 +1031,8 @@
</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">- $some_pending_menu_items = $some_invalid_menu_items = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $some_pending_menu_items = false;
+ $some_invalid_menu_items = false;
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu_items as $menu_item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $some_pending_menu_items = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1181,7 +1186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_option['auto_add'][] = $nav_menu_selected_id;
</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 ( false !== ( $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_search( $nav_menu_selected_id, $nav_menu_option['auto_add'] );
+ if ( false !== $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $nav_menu_option['auto_add'][ $key ] );
</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="trunksrcwpadminincludesnetworkphp"></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/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/network.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,11 +82,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Base domain.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_clean_basedomain() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $existing_domain = network_domain_check() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $existing_domain = network_domain_check();
+ if ( $existing_domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $existing_domain;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $slash = strpos( $domain, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slash = strpos( $domain, '/' );
+ if ( $slash ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $domain = substr( $domain, 0, $slash );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $domain;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,7 +187,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_install = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $got_mod_rewrite = got_mod_rewrite() ) { // dangerous assumptions
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $got_mod_rewrite = got_mod_rewrite();
+ if ( $got_mod_rewrite ) { // dangerous assumptions
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="updated inline"><p><strong>' . __( 'Note:' ) . '</strong> ';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: mod_rewrite */
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></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/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/plugin-install.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -160,7 +160,8 @@
</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"> $http_url = $url;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ssl = wp_http_supports( array( 'ssl' ) );
+ if ( $ssl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</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">@@ -238,8 +239,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function install_popular_tags( $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = md5( serialize( $args ) );
- if ( false !== ( $tags = get_site_transient( 'poptags_' . $key ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = md5( serialize( $args ) );
+ $tags = get_site_transient( 'poptags_' . $key );
+ if ( false !== $tags ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $tags;
</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="trunksrcwpadminincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/plugin.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Translate fields
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $translate ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $textdomain = $plugin_data['TextDomain'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $textdomain = $plugin_data['TextDomain'];
+ if ( $textdomain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_textdomain_loaded( $textdomain ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugin_data['DomainPath'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +365,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_dir( WPMU_PLUGIN_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_plugins;
</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 ( $plugins_dir = @ opendir( WPMU_PLUGIN_DIR ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugins_dir = @opendir( WPMU_PLUGIN_DIR );
+ if ( $plugins_dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $file, -4 ) == '.php' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_files[] = $file;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,7 +433,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_dropins = _get_dropins();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // These exist in the wp-content directory
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $plugins_dir = @ opendir( WP_CONTENT_DIR ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugins_dir = @opendir( WP_CONTENT_DIR );
+ if ( $plugins_dir ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_dropins[ $file ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_files[] = $file;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -733,8 +736,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $network_current = get_site_option( 'active_sitewide_plugins', array() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current = get_option( 'active_plugins', array() );
- $do_blog = $do_network = false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_option( 'active_plugins', array() );
+ $do_blog = false;
+ $do_network = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin = plugin_basename( trim( $plugin ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -992,7 +996,8 @@
</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"> // Remove deleted plugins from the plugin updates list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current = get_site_transient( 'update_plugins' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_site_transient( 'update_plugins' );
+ if ( $current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't remove the plugins that weren't deleted.
</span><span class="cx" style="display: block; padding: 0 10px"> $deleted = array_diff( $plugins, $errors );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1819,7 +1824,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hook = get_plugin_page_hook( $plugin_page, $pagenow );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = $parent1 = get_admin_page_parent();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent = get_admin_page_parent();
+ $parent1 = $parent;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $parent ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu as $menu_array ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/post.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Meta Stuff
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['meta'] ) && $post_data['meta'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_data['meta'] as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $meta = get_post_meta_by_id( $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_post_meta_by_id( $key );
+ if ( ! $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $meta->post_id != $post_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -357,7 +358,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['deletemeta'] ) && $post_data['deletemeta'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_data['deletemeta'] as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $meta = get_post_meta_by_id( $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta = get_post_meta_by_id( $key );
+ if ( ! $meta ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $meta->post_id != $post_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -531,7 +533,8 @@
</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 ( isset( $post_data['post_parent'] ) && ( $parent = (int) $post_data['post_parent'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['post_parent'] ) && (int) $post_data['post_parent'] ) {
+ $parent = (int) $post_data['post_parent'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $pages = $wpdb->get_results( "SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'" );
</span><span class="cx" style="display: block; padding: 0 10px"> $children = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +550,9 @@
</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">- $updated = $skipped = $locked = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $updated = array();
+ $skipped = array();
+ $locked = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $shared_post_data = $post_data;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_IDs as $post_ID ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1281,7 +1286,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function postbox_classes( $box_id, $screen_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['edit'] ) && $_GET['edit'] == $box_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( '' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $closed = get_user_option( 'closedpostboxes_' . $screen_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( get_user_option( 'closedpostboxes_' . $screen_id ) ) {
+ $closed = get_user_option( 'closedpostboxes_' . $screen_id );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $closed ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,11 +1562,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * the user with lock does not exist, or the post is locked by current user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_post_lock( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+ if ( ! $post ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $lock = get_post_meta( $post->ID, '_edit_lock', true );
+ if ( ! $lock ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1592,11 +1600,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * there is no current user.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_set_post_lock( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_id );
+ if ( ! $post ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == ( $user_id = get_current_user_id() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = get_current_user_id();
+ if ( 0 == $user_id ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1615,12 +1625,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return none
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _admin_notice_post_locked() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post();
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $user = null;
- if ( $user_id = wp_check_post_lock( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user = null;
+ $user_id = wp_check_post_lock( $post->ID );
+ if ( $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</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">@@ -1646,8 +1658,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locked = false;
</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 ( $locked && ( $sendback = wp_get_referer() ) &&
- false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sendback = wp_get_referer();
+ if ( $locked && $sendback && false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback_text = __( 'Go back' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1793,7 +1805,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Store one autosave per author. If there is already an autosave, overwrite it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $old_autosave = wp_get_post_autosave( $post_id, $post_author );
+ if ( $old_autosave ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_autosave = _wp_post_revision_data( $post_data, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_autosave['ID'] = $old_autosave->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_autosave['post_author'] = $post_author;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1844,7 +1857,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = (int) $_POST['post_ID'];
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['ID'] = $post_ID;
</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 ( ! $post = get_post( $post_ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post_ID );
+ if ( ! $post ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</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">@@ -1905,8 +1919,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'DOING_AUTOSAVE', true );
</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_id = (int) $post_data['post_id'];
- $post_data['ID'] = $post_data['post_ID'] = $post_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $post_data['post_id'];
+ $post_data['ID'] = $post_id;
+ $post_data['post_ID'] = $post_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/revision.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,12 +20,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Or, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_revision_ui_diff( $post, $compare_from, $compare_to ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post( $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post );
+ if ( ! $post ) {
</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 class="cx" style="display: block; padding: 0 10px"> if ( $compare_from ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $compare_from = get_post( $compare_from ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compare_from = get_post( $compare_from );
+ if ( ! $compare_from ) {
</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"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compare_from = false;
</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 ( ! $compare_to = get_post( $compare_to ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $compare_to = get_post( $compare_to );
+ if ( ! $compare_to ) {
</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="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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/taxonomy.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_category( $cat_name, $parent = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id = category_exists( $cat_name, $parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = category_exists( $cat_name, $parent );
+ if ( $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $id;
</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">@@ -77,10 +78,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_categories( $categories, $post_id = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $categories as $category ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id = category_exists( $category ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = category_exists( $category );
+ if ( $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_ids[] = $id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $id = wp_create_category( $category ) ) {
- $cat_ids[] = $id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $id = wp_create_category( $category );
+ if ( $id ) {
+ $cat_ids[] = $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">@@ -300,7 +305,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|WP_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_create_term( $tag_name, $taxonomy = 'post_tag' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id = term_exists( $tag_name, $taxonomy ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = term_exists( $tag_name, $taxonomy );
+ if ( $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $id;
</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="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/template.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1212,7 +1212,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sorted = get_user_option( "meta-box-order_$page" );
+ if ( ! $already_sorted && $sorted ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sorted as $box_context => $ids ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( explode( ',', $ids ) as $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $id && 'dashboard_browser_nag' !== $id ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemeinstallphp"></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/theme-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme-install.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/theme-install.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function install_themes_feature_list() {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.1.0', 'get_theme_feature_list()' );
</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 ( ! $cache = get_transient( 'wporg_theme_feature_list' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache = get_transient( 'wporg_theme_feature_list' );
+ if ( ! $cache ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
</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="trunksrcwpadminincludesthemephp"></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/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/theme.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,7 +303,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $features;
</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 ( ! $feature_list = get_site_transient( 'wporg_theme_feature_list' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $feature_list = get_site_transient( 'wporg_theme_feature_list' );
+ if ( ! $feature_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_site_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
</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">@@ -490,7 +491,8 @@
</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"> $http_url = $url;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ssl = wp_http_supports( array( 'ssl' ) );
+ if ( $ssl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</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="trunksrcwpadminincludestranslationinstallphp"></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/translation-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/translation-install.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/translation-install.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,8 +35,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $res = apply_filters( 'translations_api', false, $type, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $res ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $http_url = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
- if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'http://api.wordpress.org/translations/' . $type . '/1.0/';
+ $http_url = $url;
+ $ssl = wp_http_supports( array( 'ssl' ) );
+ if ( $ssl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</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">@@ -117,8 +119,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * in an error, an empty array will be returned.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_available_translations() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_installing() && false !== ( $translations = get_site_transient( 'available_translations' ) ) ) {
- return $translations;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_installing() ) {
+ $translations = get_site_transient( 'available_translations' );
+ if ( false !== $translations ) {
+ return $translations;
+ }
</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"> include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/update.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -116,9 +116,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool|array False on failure. An array of checksums on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_core_checksums( $version, $locale ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+ $url = $http_url;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ssl = wp_http_supports( array( 'ssl' ) );
+ if ( $ssl ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</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="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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/upgrade.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1260,7 +1260,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_group = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Associate terms with the same slug in a term group and make slugs unique.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) );
+ if ( $exists ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_group = $exists[0]->term_group;
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $exists[0]->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $num = 2;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1365,7 +1366,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_group = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Associate terms with the same slug in a term group and make slugs unique.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exists = $wpdb->get_results( $wpdb->prepare( "SELECT term_id, term_group FROM $wpdb->terms WHERE slug = %s", $slug ) );
+ if ( $exists ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term_group = $exists[0]->term_group;
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = $exists[0]->term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1823,8 +1825,11 @@
</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 ( $wp_current_db_version < 22422 && $term = get_term_by( 'slug', 'post-format-standard', 'post_format' ) ) {
- wp_delete_term( $term->term_id, 'post_format' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_current_db_version < 22422 ) {
+ $term = get_term_by( 'slug', 'post-format-standard', 'post_format' );
+ if ( $term ) {
+ wp_delete_term( $term->term_id, 'post_format' );
+ }
</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">@@ -2430,7 +2435,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_alloptions_110() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> $all_options = new stdClass;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+ if ( $options ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $options as $option ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $option->option_value = untrailingslashit( $option->option_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2607,7 +2613,9 @@
</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"> // Clear the field and index arrays.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $cfields = $indices = $indices_without_subparts = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cfields = array();
+ $indices = array();
+ $indices_without_subparts = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get all of the field names in the query from between the parentheses.
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '|\((.*)\)|ms', $qry, $match2 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2682,7 +2690,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_name = ( 'PRIMARY KEY' === $index_type ) ? '' : '`' . strtolower( $index_matches['index_name'] ) . '`';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Parse the columns. Multiple columns are separated by a comma.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index_columns = $index_columns_without_subparts = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_columns = array_map( 'trim', explode( ',', $index_matches['index_columns'] ) );
+ $index_columns_without_subparts = $index_columns;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Normalize columns.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $index_columns as $id => &$index_column ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2852,7 +2861,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= " ($index_columns)";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the index definition exists, ignoring subparts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( ( $aindex = array_search( $index_string, $indices_without_subparts ) ) === false ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aindex = array_search( $index_string, $indices_without_subparts );
+ if ( false !== $aindex ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the index already exists (even with different subparts), we don't need to create it.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $indices_without_subparts[ $aindex ] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $indices[ $aindex ] );
</span></span></pre></div>
<a id="trunksrcwpadminincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/user.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_login = sanitize_user( $_POST['user_login'], true );
</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">- $pass1 = $pass2 = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pass1 = '';
+ $pass2 = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['pass1'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pass1 = $_POST['pass1'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,8 +202,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $user->user_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn’t correct.' ), array( 'form-field' => 'email' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $owner_id = email_exists( $user->user_email ) ) && ( ! $update || ( $owner_id != $user->ID ) ) ) {
- $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ $owner_id = email_exists( $user->user_email );
+ if ( $owner_id && ( ! $update || ( $owner_id != $user->ID ) ) ) {
+ $errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ), array( 'form-field' => 'email' ) );
+ }
</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="trunksrcwpadminincludeswidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/includes/widgets.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="widget-description">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo ( $widget_description = wp_widget_description( $widget_id ) ) ? "$widget_description\n" : "$widget_title\n"; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php
+ $widget_description = wp_widget_description( $widget_id );
+ echo ( $widget_description ) ? "$widget_description\n" : "$widget_title\n";
+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo $sidebar_args['after_widget'];
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></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/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/install.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -307,13 +307,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 0: // Step 0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
- $scripts_to_print[] = 'language-chooser';
- display_header( 'language-chooser' );
- echo '<form id="setup" method="post" action="?step=1">';
- wp_install_language_form( $languages );
- echo '</form>';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_can_install_language_pack() && empty( $language ) ) {
+ $languages = wp_get_available_translations();
+ if ( $languages ) {
+ $scripts_to_print[] = 'language-chooser';
+ display_header( 'language-chooser' );
+ echo '<form id="setup" method="post" action="?step=1">';
+ wp_install_language_form( $languages );
+ echo '</form>';
+ break;
+ }
</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"> // Deliberately fall through if we can't reach the translations API.
</span></span></pre></div>
<a id="trunksrcwpadminlinkmanagerphp"></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-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-manager.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/link-manager.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,8 +44,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table->prepare_items();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$title = __( 'Links' );
-$this_file = $parent_file = 'link-manager.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$title = __( 'Links' );
+$this_file = 'link-manager.php';
+$parent_file = $this_file;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/link.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link_id = (int) $_GET['link_id'];
</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 ( ! $link = get_link_to_edit( $link_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_link_to_edit( $link_id );
+ if ( ! $link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Link not found.' ) );
</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="trunksrcwpadminmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/media.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $errors ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'media.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $referer = wp_get_original_referer() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $referer = wp_get_original_referer();
+ if ( $referer ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $referer, 'upload.php' ) || ( url_to_postid( $referer ) == $attachment_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = $referer;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/menu-header.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -108,7 +108,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $img = $img_style = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $img = '';
+ $img_style = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $img_class = ' dashicons-before';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +153,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_items = array_values( $submenu_items ); // Re-index.
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $submenu_items[0][2];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_file, '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +166,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $item[2];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_file, '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,7 +199,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_file = $item[2];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_file, '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</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">@@ -226,7 +230,8 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== ( $pos = strpos( $sub_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $sub_file, '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sub_file = substr( $sub_file, 0, $pos );
</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="trunksrcwpadminoptionsgeneralphp"></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/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/options-general.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,8 @@
</span><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"> if ( ! is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_site_url_class = $wp_home_class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_site_url_class = '';
+ $wp_home_class = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WP_SITEURL' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_site_url_class = ' disabled';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></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/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/options-permalink.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,7 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $iis7_permalinks = iis7_supports_permalinks();
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = get_option( 'permalink_structure' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$prefix = $blog_prefix = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$prefix = '';
+$blog_prefix = '';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! got_url_rewrite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = '/index.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></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/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/options.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,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">-$whitelist_options = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$whitelist_options = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'general' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogname',
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogdescription',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,7 +146,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'default_post_format',
</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">-$whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$whitelist_options['misc'] = array();
+$whitelist_options['options'] = array();
+$whitelist_options['privacy'] = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
</span><span class="cx" style="display: block; padding: 0 10px">
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/plugins.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = dirname( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '.' == $plugin_slug ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
+ if ( $data ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin ] = $data;
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin_info[ $plugin ]['Network'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -300,7 +301,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Get plugins list from that folder.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $folder_plugins = get_plugins( '/' . $plugin_slug ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $folder_plugins = get_plugins( '/' . $plugin_slug );
+ if ( $folder_plugins ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $folder_plugins as $plugin_file => $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin_file ] = _get_plugin_data_markup_translate( $plugin_file, $data );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin_file ]['is_uninstallable'] = is_uninstallable_plugin( $plugin );
</span></span></pre></div>
<a id="trunksrcwpadminpostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/post.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,12 +19,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['post'] ) && isset( $_POST['post_ID'] ) && (int) $_GET['post'] !== (int) $_POST['post_ID'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'A post ID mismatch has been detected.' ), __( 'Sorry, you are not allowed to edit this item.' ), 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['post'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $post_ID = (int) $_GET['post'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $_GET['post'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['post_ID'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = $post_ID = (int) $_POST['post_ID'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $_POST['post_ID'];
</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">- $post_id = $post_ID = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$post_ID = $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"> * @global string $post_type
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -241,7 +242,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
</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 ( $user_id = wp_check_post_lock( $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = wp_check_post_lock( $post_id );
+ if ( $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( __( 'You cannot move this item to the Trash. %s is currently editing.' ), $user->display_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminrevisionphp"></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/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/revision.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/revision.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'restore':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $revision = wp_get_post_revision( $revision_id );
+ if ( ! $revision ) {
</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">@@ -41,7 +42,8 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $post = get_post( $revision->post_parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $revision->post_parent );
+ if ( ! $post ) {
</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">@@ -70,10 +72,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'view':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'edit':
</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">- if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $revision = wp_get_post_revision( $revision_id );
+ if ( ! $revision ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</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 ( ! $post = get_post( $revision->post_parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $post = get_post( $revision->post_parent );
+ if ( ! $post ) {
</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">@@ -110,10 +115,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is so that the correct "Edit" menu item is selected.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post->post_type ) && 'post' != $post->post_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_file = 'edit.php?post_type=' . $post->post_type;
</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">- $parent_file = $submenu_file = 'edit.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_file = 'edit.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$submenu_file = $parent_file;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'revisions' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></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/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/setup-config.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,13 +126,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $step ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case -1:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_can_install_language_pack() && empty( $language ) && ( $languages = wp_get_available_translations() ) ) {
- setup_config_display_header( 'language-chooser' );
- echo '<h1 class="screen-reader-text">Select a default language</h1>';
- echo '<form id="setup" method="post" action="?step=0">';
- wp_install_language_form( $languages );
- echo '</form>';
- break;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_can_install_language_pack() && empty( $language ) ) {
+ $languages = wp_get_available_translations();
+ if ( $languages ) {
+ setup_config_display_header( 'language-chooser' );
+ echo '<h1 class="screen-reader-text">Select a default language</h1>';
+ echo '<form id="setup" method="post" action="?step=0">';
+ wp_install_language_form( $languages );
+ echo '</form>';
+ break;
+ }
</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"> // Deliberately fall through if we can't reach the translations API.
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/theme-editor.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
</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">-$allowed_files = $style_files = array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$allowed_files = array();
+$style_files = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> $has_templates = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file_types = wp_get_theme_file_editable_extensions( $theme );
</span></span></pre></div>
<a id="trunksrcwpadminthemesphp"></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/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/themes.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,8 @@
</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 ( false !== ( $pos = strpos( $menu_file, '?' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = strpos( $menu_file, '?' );
+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_file = substr( $menu_file, 0, $pos );
</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">@@ -368,7 +369,8 @@
</span><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"> // List broken themes, if any.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes = wp_get_themes( array( 'errors' => true ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$broken_themes = wp_get_themes( array( 'errors' => true ) );
+if ( ! is_multisite() && current_user_can( 'edit_themes' ) && $broken_themes ) {
</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"> <div class="broken-themes">
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/update-core.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,15 +35,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_local_package, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px"> static $first_pass = true;
</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_version = get_bloginfo( 'version' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_version = get_bloginfo( 'version' );
+ $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'en_US' == $update->locale && 'en_US' == get_locale() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $version_string = $update->current;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version && ( $updates = get_core_updates() ) && 1 == count( $updates ) ) {
- // If the only available update is a partial builds, it doesn't need a language-specific version string.
- $version_string = $update->current;
- } else {
- $version_string = sprintf( '%s–<strong>%s</strong>', $update->current, $update->locale );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_US' == $update->locale && $update->packages->partial && $wp_version == $update->partial_version ) {
+ $updates = get_core_updates();
+ if ( $updates && 1 == count( $updates ) ) {
+ // If the only available update is a partial builds, it doesn't need a language-specific version string.
+ $version_string = $update->current;
+ }
</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"> $current = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -537,7 +539,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <h1><?php _e( 'Update WordPress' ); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership );
+ if ( false === $credentials ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '</div>';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/upload.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,8 @@
</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"> $location = 'upload.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $referer = wp_get_referer() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $referer = wp_get_referer();
+ if ( $referer ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $referer, 'upload.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -286,7 +287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'posted' ), $_SERVER['REQUEST_URI'] );
</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 ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['attached'] ) && absint( $_GET['attached'] ) ) {
+ $attached = absint( $_GET['attached'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $attached ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Media file attached.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +299,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
</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 ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['detach'] ) && absint( $_GET['detach'] ) ) {
+ $detached = absint( $_GET['detach'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $detached ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Media file detached.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +311,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
</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 ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['deleted'] ) && absint( $_GET['deleted'] ) ) {
+ $deleted = absint( $_GET['deleted'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $deleted ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Media file permanently deleted.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +323,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'deleted' ), $_SERVER['REQUEST_URI'] );
</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 ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['trashed'] ) && absint( $_GET['trashed'] ) ) {
+ $trashed = absint( $_GET['trashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $trashed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Media file moved to the trash.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +336,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'trashed' ), $_SERVER['REQUEST_URI'] );
</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 ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['untrashed'] ) && absint( $_GET['untrashed'] ) ) {
+ $untrashed = absint( $_GET['untrashed'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $untrashed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Media file restored from the trash.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></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/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/user-edit.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -602,7 +602,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $show Whether to show the password fields. Default true.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User $profileuser User object for the current user to edit.
</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 ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser );
+ if ( $show_password_fields ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></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/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/users.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'add':
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'New user created.' );
</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 ( isset( $_GET['id'] ) && ( $user_id = $_GET['id'] ) && current_user_can( 'edit_user', $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = isset( $_GET['id'] ) ? $_GET['id'] : false;
+ if ( $user_id && current_user_can( 'edit_user', $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> ' <a href="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url(
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets.php 2019-07-01 08:26:25 UTC (rev 45582)
+++ trunk/src/wp-admin/widgets.php 2019-07-01 12:50:14 UTC (rev 45583)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +254,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $control_callback = $control['callback'];
</span><span class="cx" style="display: block; padding: 0 10px"> $multi_number = (int) $_GET['num'];
</span><span class="cx" style="display: block; padding: 0 10px"> $control['params'][0]['number'] = -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $control['id'] = $control['id_base'] . '-' . $multi_number;
+ $widget_id = $control['id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_widget_controls[ $control['id'] ] = $control;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +499,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$i = $split = 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$i = 0;
+$split = 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $single_sidebar_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebars_count = count( $theme_sidebars );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>