<!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>[47219] trunk/src: Coding Standards: Use Yoda conditions where appropriate.</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/47219">47219</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/47219","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-02-09 16:52:28 +0000 (Sun, 09 Feb 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Use Yoda conditions where appropriate.
See <a href="https://core.trac.wordpress.org/ticket/49222">#49222</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.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="#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="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclassplugininstallerskinphp">trunk/src/wp-admin/includes/class-plugin-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeinstallerskinphp">trunk/src/wp-admin/includes/class-theme-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassthemeupgraderphp">trunk/src/wp-admin/includes/class-theme-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkercategorychecklistphp">trunk/src/wp-admin/includes/class-walker-category-checklist.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="#trunksrcwpadminincludesclasswpfilesystemdirectphp">trunk/src/wp-admin/includes/class-wp-filesystem-direct.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="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-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="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.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="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpadminincludesimportphp">trunk/src/wp-admin/includes/import.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmetaboxesphp">trunk/src/wp-admin/includes/meta-boxes.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="#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="#trunksrcwpadminincludesprivacytoolsphp">trunk/src/wp-admin/includes/privacy-tools.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.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="#trunksrcwpadmininstallhelperphp">trunk/src/wp-admin/install-helper.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminpostnewphp">trunk/src/wp-admin/post-new.php</a></li>
<li><a href="#trunksrcwpadmintoolsphp">trunk/src/wp-admin/tools.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenfunctionsphp">trunk/src/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninccustomheaderphp">trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteeninccustomheaderphp">trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelveinccustomheaderphp">trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</a></li>
<li><a href="#trunksrcwpincludesbookmarktemplatephp">trunk/src/wp-includes/bookmark-template.php</a></li>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludescategoryphp">trunk/src/wp-includes/category.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkerpagephp">trunk/src/wp-includes/class-walker-page.php</a></li>
<li><a href="#trunksrcwpincludesclasswpadminbarphp">trunk/src/wp-includes/class-wp-admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswphookphp">trunk/src/wp-includes/class-wp-hook.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcurlphp">trunk/src/wp-includes/class-wp-http-curl.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpixrclientphp">trunk/src/wp-includes/class-wp-http-ixr-client.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpproxyphp">trunk/src/wp-includes/class-wp-http-proxy.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorimagickphp">trunk/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnetworkqueryphp">trunk/src/wp-includes/class-wp-network-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswprolesphp">trunk/src/wp-includes/class-wp-roles.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsimplepiesanitizeksesphp">trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunksrcwpincludesclasswpwalkerphp">trunk/src/wp-includes/class-wp-walker.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesclasswpscriptsphp">trunk/src/wp-includes/class.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesclasswpstylesphp">trunk/src/wp-includes/class.wp-styles.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesfeedatomcommentsphp">trunk/src/wp-includes/feed-atom-comments.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmsfilesphp">trunk/src/wp-includes/ms-files.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespomomophp">trunk/src/wp-includes/pomo/mo.php</a></li>
<li><a href="#trunksrcwpincludespomopluralformsphp">trunk/src/wp-includes/pomo/plural-forms.php</a></li>
<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminheaderphp"></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/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/admin-header.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -288,6 +288,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'all_admin_notices' );
</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 ( $parent_file == 'options-general.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'options-general.php' === $parent_file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . 'wp-admin/options-head.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/comment.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No need to re-approve/re-trash/re-spam a comment.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $action == str_replace( '1', 'approve', $comment->comment_approved ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_replace( '1', 'approve', $comment->comment_approved ) == $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'edit-comments.php?same=' . $comment_id ) );
</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">@@ -137,7 +137,7 @@
</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 ( $comment->comment_approved != '0' ) { // If not unapproved.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $comment->comment_approved ) { // If not unapproved.
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = '';
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case '1':
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/edit-comments.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,7 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['delete_comments'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $_REQUEST['delete_comments'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = ( $_REQUEST['action'] != -1 ) ? $_REQUEST['action'] : $_REQUEST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['ids'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = array_map( 'absint', explode( ',', $_REQUEST['ids'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( wp_get_referer() ) {
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/edit-form-advanced.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_ID = isset( $user_ID ) ? (int) $user_ID : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $action ) ? $action : '';
</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 == get_option( 'page_for_posts' ) && empty( $post->post_content ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( get_option( 'page_for_posts' ) == $post_ID && empty( $post->post_content ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'edit_form_after_title', '_wp_posts_page_notice' );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_post_type_support( $post_type, 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $shortlink = wp_get_shortlink( $post->ID, '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 ( ! empty( $shortlink ) && $shortlink !== $permalink && $permalink !== home_url( '?page_id=' . $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $shortlink ) && $shortlink !== $permalink && home_url( '?page_id=' . $post->ID ) !== $permalink ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr( $shortlink ) . '" /><button type="button" class="button button-small" onclick="prompt('URL:', jQuery(\'#shortlink\').val());">' . __( 'Get Shortlink' ) . '</button>';
</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="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Require $term_search_min_chars chars for matching (default: 2)
</span><span class="cx" style="display: block; padding: 0 10px"> * ensure it's a non-negative, non-zero integer.
</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 ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 0 == $term_search_min_chars ) || ( strlen( $s ) < $term_search_min_chars ) ) {
</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">@@ -295,7 +295,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = get_current_blog_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">- $include_blog_users = ( $type == 'search' ? get_users(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $include_blog_users = ( 'search' === $type ? get_users(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ID',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -302,7 +302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) : array() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exclude_blog_users = ( $type == 'add' ? get_users(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exclude_blog_users = ( 'add' === $type ? get_users(
</ins><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blog_id' => $id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ID',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/dashboard.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenow = $_GET['pagenow'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pagenow === 'dashboard-user' || $pagenow === 'dashboard-network' || $pagenow === 'dashboard' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dashboard-user' === $pagenow || 'dashboard-network' === $pagenow || 'dashboard' === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_current_screen( $pagenow );
</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">@@ -573,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 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 ( $taxonomy->name == 'category' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' === $taxonomy->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_category = isset( $_POST['post_category'] ) ? (array) $_POST['post_category'] : array();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_category = ( isset( $_POST['tax_input'] ) && isset( $_POST['tax_input'][ $taxonomy->name ] ) ) ? (array) $_POST['tax_input'][ $taxonomy->name ] : array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -717,7 +717,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_untrash_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Undo trash, not in trash.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['comment_status'] ) || 'trash' !== $_POST['comment_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $delta = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['spam'] ) && 1 == $_POST['spam'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -734,7 +734,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_unspam_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Undo spam, not in spam.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['comment_status'] ) || 'spam' !== $_POST['comment_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $delta = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['delete'] ) && 1 == $_POST['delete'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1318,7 +1318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['approve_parent'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_comment( $comment_parent );
</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 ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent && '0' === $parent->comment_approved && $parent->comment_post_ID == $comment_post_ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_comment', $parent->comment_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">@@ -1549,7 +1549,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 the post is an autodraft, save the post as a draft and then attempt to save the meta.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post->post_status == 'auto-draft' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'auto-draft' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['action'] = 'draft'; // Warning fix.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_ID'] = $pid;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1720,7 +1720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
</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 ( $page != sanitize_key( $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_key( $page ) != $page ) {
</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">@@ -1751,7 +1751,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
</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 ( $page != sanitize_key( $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_key( $page ) != $page ) {
</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">@@ -1900,13 +1900,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
</span><span class="cx" style="display: block; padding: 0 10px"> $page_columns = isset( $_POST['page_columns'] ) ? $_POST['page_columns'] : 'auto';
</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 ( $page_columns != 'auto' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'auto' !== $page_columns ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_columns = (int) $page_columns;
</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"> $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
</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 ( $page != sanitize_key( $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_key( $page ) != $page ) {
</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">@@ -2003,7 +2003,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User's display name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $msg_template = __( 'Saving is disabled: %s is currently editing this 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 ( $_POST['post_type'] == 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $_POST['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User's display name. */
</span><span class="cx" style="display: block; padding: 0 10px"> $msg_template = __( 'Saving is disabled: %s is currently editing this page.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2067,7 +2067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => $_POST['screen'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = $_POST['post_view'] === 'excerpt' ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = 'excerpt' === $_POST['post_view'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $level = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_post_type_hierarchical( $wp_list_table->screen->post_type ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2639,7 +2639,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "set_post_thumbnail-$post_ID" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $thumbnail_id == '-1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '-1' == $thumbnail_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( delete_post_thumbnail( $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = _wp_post_thumbnail_html( null, $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $json ? wp_send_json_success( $return ) : wp_die( $return );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2819,7 +2819,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
</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 ( $active_lock[1] != get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_user_id() != $active_lock[1] ) {
</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">@@ -2844,7 +2844,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_dismiss_wp_pointer() {
</span><span class="cx" style="display: block; padding: 0 10px"> $pointer = $_POST['pointer'];
</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 ( $pointer != sanitize_key( $pointer ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_key( $pointer ) != $pointer ) {
</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">@@ -3022,7 +3022,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $changes['alt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = wp_unslash( $changes['alt'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $alt != get_post_meta( $id, '_wp_attachment_image_alt', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_meta( $id, '_wp_attachment_image_alt', true ) !== $alt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alt = wp_strip_all_tags( $alt, true );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $id, '_wp_attachment_image_alt', wp_slash( $alt ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3816,7 +3816,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sessions = WP_Session_Tokens::get_instance( $user->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->ID === get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_user_id() === $user->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sessions->destroy_others( wp_get_session_token() );
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'You are now logged out everywhere else.' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,7 +78,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->upgrade_strings();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Is an update available?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $current->response ) || $current->response == 'latest' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $current->response ) || 'latest' === $current->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'up_to_date', $this->strings['up_to_date'] );
</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="trunksrcwpadminincludesclasscustomimageheaderphp"></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-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -812,7 +812,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If flexible height isn't supported and the image is the exact right size.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && get_theme_support( 'custom-header', 'width' ) == $width && get_theme_support( 'custom-header', 'height' ) == $height ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassplugininstallerskinphp"></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-plugin-installer-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,19 +89,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $install_actions['activate_plugin'] );
</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 ( 'import' == $from ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'import' === $from ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['importers_page'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> admin_url( 'import.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Return to Importers' )
</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 ( $this->type == 'web' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'web' === $this->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['plugins_page'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'plugin-install.php' ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Return to Plugin Installer' )
</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 ( 'upload' == $this->type && 'plugins' == $from ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upload' === $this->type && 'plugins' === $from ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['plugins_page'] = 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"> self_admin_url( 'plugin-install.php' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeinstallerskinphp"></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-installer-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-installer-skin.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-theme-installer-skin.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -114,7 +114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->type == 'web' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'web' === $this->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['themes_page'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> self_admin_url( 'theme-install.php' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassthemeupgraderphp"></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.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.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-theme-upgrader.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -367,7 +367,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $maintenance = ( is_multisite() && ! empty( $themes ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $themes as $theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $maintenance = $maintenance || $theme == get_stylesheet() || $theme == get_template();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $maintenance = $maintenance || get_stylesheet() === $theme || get_template() === $theme;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $maintenance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->maintenance_mode( true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -539,7 +539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
</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 ( $theme != get_stylesheet() ) { // If not current.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() !== $theme ) { // If not current.
</ins><span class="cx" style="display: block; padding: 0 10px"> return $return;
</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">@@ -570,12 +570,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = isset( $theme['theme'] ) ? $theme['theme'] : '';
</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 ( $theme != get_stylesheet() ) { // If not current.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() !== $theme ) { // If not current.
</ins><span class="cx" style="display: block; padding: 0 10px"> return $return;
</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"> // Ensure stylesheet name hasn't changed after the upgrade:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $theme == get_stylesheet() && $theme != $this->result['destination_name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_stylesheet() === $theme && $theme != $this->result['destination_name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_clean_themes_cache();
</span><span class="cx" style="display: block; padding: 0 10px"> $stylesheet = $this->result['destination_name'];
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( $stylesheet );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkercategorychecklistphp"></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-walker-category-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-category-checklist.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-walker-category-checklist.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,7 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $args['taxonomy'];
</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 ( $taxonomy == 'category' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = 'post_category';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = 'tax_input[' . $taxonomy . ']';
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,7 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_vcs_checkout( $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $context_dirs = array( untrailingslashit( $context ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context !== ABSPATH ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ABSPATH !== $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $context_dirs[] = untrailingslashit( ABSPATH );
</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">@@ -86,7 +86,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check_dirs[] = $context_dir;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Once we've hit '/' or 'C:\', we need to stop. dirname will keep returning the input here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context_dir == dirname( $context_dir ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( dirname( $context_dir ) === $context_dir ) {
</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">@@ -227,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $notified = get_site_option( 'auto_core_update_notified' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't notify if we've already notified the same email address of the same version.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $notified && get_site_option( 'admin_email' ) === $notified['email'] && $notified['version'] == $item->current ) {
</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">@@ -536,9 +536,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
</span><span class="cx" style="display: block; padding: 0 10px"> // We should not try to perform a background update again until there is a successful one-click update performed by the user.
</span><span class="cx" style="display: block; padding: 0 10px"> $critical = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $error_code === 'disk_full' || false !== strpos( $error_code, '__copy_dir' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $critical = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $error_code === 'rollback_was_required' && is_wp_error( $result->get_error_data()->rollback ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // A rollback is only critical if it failed too.
</span><span class="cx" style="display: block; padding: 0 10px"> $critical = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $rollback_result = $result->get_error_data()->rollback;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,7 +584,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $n = get_site_option( 'auto_core_update_notified' );
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't notify if we've already notified the same email address of the same version of the same notification type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $n && 'fail' == $n['type'] && $n['email'] == get_site_option( 'admin_email' ) && $n['version'] == $core_update->current ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $n && 'fail' === $n['type'] && get_site_option( 'admin_email' ) === $n['email'] && $n['version'] == $core_update->current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $send = 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">@@ -762,7 +762,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"> // Updates are important!
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type != 'success' || $newer_version_available ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'success' !== $type || $newer_version_available ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . __( 'Keeping your site updated is important for security. It also makes the internet a safer place for you and your readers.' );
</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">@@ -771,7 +771,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 things are successful and we're now on the latest, mention plugins and themes if any are out of date.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type == 'success' && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'success' === $type && ! $newer_version_available && ( get_plugin_updates() || get_theme_updates() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . __( 'You also have some plugins or themes with updates available. Update them now:' );
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . network_admin_url();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -749,7 +749,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Reply and quickedit need a hide-if-no-js span when not added with ajax.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 'reply' === $action || 'quickedit' === $action ) && ! wp_doing_ajax() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' hide-if-no-js';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( $action === 'untrash' && $the_comment_status === 'trash' ) || ( $action === 'unspam' && $the_comment_status === 'spam' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( 'untrash' === $action && 'trash' === $the_comment_status ) || ( 'unspam' === $action && 'spam' === $the_comment_status ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '1' == get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' approve';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystemdirectphp"></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-direct.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-direct.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,10 +471,10 @@
</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 touch( $file, $time = 0, $atime = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $time == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $time ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = 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">- if ( $atime == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $atime ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $atime = time();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return touch( $file, $time, $atime );
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +574,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $lucifer[3] += 1900; // 4-digit year fix.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $b['isdir'] = ( $lucifer[7] == '<DIR>' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b['isdir'] = ( '<DIR>' === $lucifer[7] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $b['isdir'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $b['type'] = 'd';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,8 +598,8 @@
</span><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"> $b = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $b['isdir'] = $lucifer[0][0] === 'd';
- $b['islink'] = $lucifer[0][0] === 'l';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $b['isdir'] = 'd' === $lucifer[0][0];
+ $b['islink'] = 'l' === $lucifer[0][0];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $b['isdir'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $b['type'] = 'd';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $b['islink'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,7 +613,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $b['owner'] = $lucifer[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $b['group'] = $lucifer[3];
</span><span class="cx" style="display: block; padding: 0 10px"> $b['size'] = $lucifer[4];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $lcount == 8 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 8 == $lcount ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> sscanf( $lucifer[5], '%d-%d-%d', $b['year'], $b['month'], $b['day'] );
</span><span class="cx" style="display: block; padding: 0 10px"> sscanf( $lucifer[6], '%d:%d', $b['hour'], $b['minute'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $b['time'] = mktime( $b['hour'], $b['minute'], 0, $b['month'], $b['day'], $b['year'] );
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -202,7 +202,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $bytes_written = fwrite( $temphandle, $contents );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $bytes_written || $bytes_written != strlen( $contents ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $bytes_written || strlen( $contents ) != $bytes_written ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> fclose( $temphandle );
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $temp );
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $stream );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $returnbool ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( $data === false ) ? false : '' != trim( $data );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( false === $data ) ? false : '' != trim( $data );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function put_contents( $file, $contents, $mode = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = file_put_contents( $this->sftp_path( $file ), $contents );
</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 ( $ret !== strlen( $contents ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $contents ) !== $ret ) {
</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="trunksrcwpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-importer.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,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"> $last_arg = $key;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $last_arg !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( null !== $last_arg ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $out[ $last_arg ] = $args[ $i ];
</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="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,18 +830,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $disable_prev = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $disable_next = false;
</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 ( $current == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $disable_first = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $disable_prev = 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">- if ( $current == 2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 2 == $current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $disable_first = 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">- if ( $current == $total_pages ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $total_pages == $current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $disable_last = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $disable_next = 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">- if ( $current == $total_pages - 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $total_pages - 1 == $current ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $disable_last = true;
</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="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -626,8 +626,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ( have_posts() ) :
</span><span class="cx" style="display: block; padding: 0 10px"> the_post();
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $this->is_trash && $post->post_status != 'trash' )
- || ( ! $this->is_trash && $post->post_status === 'trash' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $this->is_trash && 'trash' !== $post->post_status )
+ || ( ! $this->is_trash && 'trash' === $post->post_status )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $s, $mode, $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px"> set_user_setting( 'sites_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = get_user_setting( 'sites_list_mode', 'list' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'sites.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $statuses as $status => $label_count ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current_link_attributes = $requested_status === $status || ( $requested_status === '' && 'all' === $status )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = $requested_status === $status || ( '' === $requested_status && 'all' === $status )
</ins><span class="cx" style="display: block; padding: 0 10px"> ? ' class="current" aria-current="page"'
</span><span class="cx" style="display: block; padding: 0 10px"> : '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( (int) $counts[ $status ] > 0 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +476,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s 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">- echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ( '0000-00-00 00:00:00' === $blog['last_updated'] ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
</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">@@ -497,7 +497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date = __( 'Y/m/d g:i:s 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 ( $blog['registered'] === '0000-00-00 00:00:00' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $blog['registered'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '—';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo mysql2date( $date, $blog['registered'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> reset( $this->status_list );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->status_list as $status => $col ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog[ $status ] == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $blog[ $status ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = " class='{$col[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">@@ -693,19 +693,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['backend'] = "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_network()->site_id != $blog['blog_id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog['deleted'] == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1' == $blog['deleted'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['activate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=activateblog&id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=deactivateblog&id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</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 ( $blog['archived'] == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1' == $blog['archived'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['archive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</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 ( $blog['spam'] == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1' == $blog['spam'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['spam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = ucfirst( $orderby );
</span><span class="cx" style="display: block; padding: 0 10px"> $order = strtoupper( $order );
</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 ( $orderby === 'Name' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'Name' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'ASC' === $order ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->items = array_reverse( $this->items );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && $stylesheet != get_option( 'stylesheet' ) && $stylesheet != get_option( 'template' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $allowed && current_user_can( 'delete_themes' ) && ! $this->is_site_themes && get_option( 'stylesheet' ) !== $stylesheet && get_option( 'template' ) !== $stylesheet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'action' => 'delete-selected',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function column_description( $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $status, $totals;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme->errors() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pre = $status === 'broken' ? __( 'Broken Theme:' ) . ' ' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pre = 'broken' === $status ? __( 'Broken Theme:' ) . ' ' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p><strong class="error-message">' . $pre . $theme->errors()->get_error_message() . '</strong></p>';
</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="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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['search'] = '*' . $args['search'] . '*';
</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 ( $role === 'super' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'super' === $role ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['login__in'] = get_super_admins();
</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">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px"> set_user_setting( 'network_users_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = get_user_setting( 'network_users_list_mode', 'list' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $super_admins = get_super_admins();
</span><span class="cx" style="display: block; padding: 0 10px"> $total_admins = count( $super_admins );
</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_link_attributes = $role !== 'super' ? ' class="current" aria-current="page"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = 'super' !== $role ? ' class="current" aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $role_links['all'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s"%s>%s</a>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -154,7 +154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> number_format_i18n( $total_users )
</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">- $current_link_attributes = $role === 'super' ? ' class="current" aria-current="page"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current_link_attributes = 'super' === $role ? ' class="current" aria-current="page"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $role_links['super'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s"%s>%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> network_admin_url( 'users.php?role=super' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><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">- $path = ( $val->path === '/' ) ? '' : $val->path;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $path = ( '/' === $val->path ) ? '' : $val->path;
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_classes = array( 'site-' . $val->site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the span class for a site listing on the mulisite user list table.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,16 +396,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['edit'] = '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $val->userblog_id ) ) . '">' . __( 'Edit' ) . '</a>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $val->spam == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $val->spam ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class .= 'site-spammed ';
</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 ( $val->mature == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $val->mature ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class .= 'site-mature ';
</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 ( $val->deleted == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $val->deleted ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class .= 'site-deleted ';
</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 ( $val->archived == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $val->archived ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class .= 'site-archived ';
</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="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></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-plugin-install-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-plugin-install-list-table.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'search' === $tab ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['search'] = __( 'Search Results' );
</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 ( $tab === 'beta' || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'beta' === $tab || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $tabs['featured'] = _x( 'Featured', 'Plugin Installer' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $which
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function display_tablenav( $which ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $GLOBALS['tab'] === 'featured' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'featured' === $GLOBALS['tab'] ) {
</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></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $total_items = $post_counts[ $_REQUEST['post_status'] ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $total_items = $this->sticky_posts_count;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_GET['author'] ) && get_current_user_id() == $_GET['author'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $total_items = $this->user_posts_count;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $total_items = array_sum( $post_counts );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,13 +178,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['mode'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mode = 'excerpt' === $_REQUEST['mode'] ? 'excerpt' : 'list';
</ins><span class="cx" style="display: block; padding: 0 10px"> set_user_setting( 'posts_list_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = get_user_setting( 'posts_list_mode', 'list' );
</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">- $this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->is_trash = isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_pagination_args(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -993,7 +993,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $can_edit_post = current_user_can( 'edit_post', $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 ( $can_edit_post && $post->post_status != 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_edit_post && 'trash' !== $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lock_holder = wp_check_post_lock( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lock_holder ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1014,7 +1014,7 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $can_edit_post && $post->post_status != 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $can_edit_post && 'trash' !== $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_edit_post_link( $post->ID ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1633,7 +1633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ); ?></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="hidden" name="<?php echo ( 'category' === $taxonomy->name ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul class="cat-checklist <?php echo esc_attr( $taxonomy->name ); ?>-checklist">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -373,7 +373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( self::$_registry[ $id ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $screen = self::$_registry[ $id ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $screen === get_current_screen() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_screen() === $screen ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $screen;
</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">@@ -454,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the block editor is being loaded, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_block_editor( $set = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $set !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== $set ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_block_editor = (bool) $set;
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/dashboard.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $last_post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $last_post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $post ) || 'auto-draft' !== $post->post_status ) { // auto-draft doesn't exist anymore.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_default_post_to_edit( 'post', true );
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/export.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -168,7 +168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put categories in order with no child going before its parent.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $cat = array_shift( $categories ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $cat->parent == 0 || isset( $cats[ $cat->parent ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $cat->parent || isset( $cats[ $cat->parent ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cats[ $cat->term_id ] = $cat;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $categories[] = $cat;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put terms in order with no child going before its parent.
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $t = array_shift( $custom_terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $t->parent == 0 || isset( $terms[ $t->parent ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $t->parent || isset( $terms[ $t->parent ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms[ $t->term_id ] = $t;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $custom_terms[] = $t;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $post->post_type == 'attachment' ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'attachment' === $post->post_type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wxr_post_taxonomy(); ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/file.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1886,7 +1886,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_file_owner = @fileowner( $temp_file_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 ( $wp_file_owner !== false && $wp_file_owner === $temp_file_owner ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $wp_file_owner && $wp_file_owner === $temp_file_owner ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * WordPress is creating files as the same owner as the WordPress files,
</span><span class="cx" style="display: block; padding: 0 10px"> * this means it's safe to modify & create new files via PHP.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2234,7 +2234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $filesystem_credentials_are_stored = request_filesystem_credentials( self_admin_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_end_clean();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request_filesystem_credentials = ( $filesystem_method != 'direct' && ! $filesystem_credentials_are_stored );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request_filesystem_credentials = ( 'direct' !== $filesystem_method && ! $filesystem_credentials_are_stored );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $request_filesystem_credentials ) {
</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="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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/image-edit.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,7 +33,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $can_restore = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $backup_sizes ) && isset( $backup_sizes['full-orig'], $meta['file'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $can_restore = $backup_sizes['full-orig']['file'] != wp_basename( $meta['file'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $can_restore = wp_basename( $meta['file'] ) !== $backup_sizes['full-orig']['file'];
</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 ( $msg ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,7 +576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $changes as $operation ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $operation->type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'rotate':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $operation->angle != 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $operation->angle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image instanceof WP_Image_Editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image->rotate( $operation->angle );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,7 +585,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'flip':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $operation->axis != 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $operation->axis ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image instanceof WP_Image_Editor ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image->flip( ( $operation->axis & 1 ) != 0, ( $operation->axis & 2 ) != 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -954,7 +954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_attachment_metadata( $post_id, $meta );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes );
</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 ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check if it's an image edit from attachment edit screen.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
</span></span></pre></div>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/image.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,7 +247,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"> // Do not scale (large) PNG images. May result in sub-sizes that have greater file size than the original. See #48736.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $imagesize['mime'] !== 'image/png' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image/png' !== $imagesize['mime'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the "BIG image" threshold value.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -310,7 +310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Log errors.
</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 ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! empty( $exif_meta['orientation'] ) && 1 !== (int) $exif_meta['orientation'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</span></span></pre></div>
<a id="trunksrcwpadminincludesimportphp"></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/import.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/import.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/import.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $popular_importers['importers'] as &$importer ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
</span><span class="cx" style="display: block; padding: 0 10px"> $importer['description'] = translate( $importer['description'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $importer['name'] != 'WordPress' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'WordPress' !== $importer['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
</span><span class="cx" style="display: block; padding: 0 10px"> $importer['name'] = translate( $importer['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/media.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -635,7 +635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $img = '<span class="wp-media-buttons-icon"></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">- $id_attribute = $instance === 1 ? ' id="insert-media-button"' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_attribute = 1 === $instance ? ' id="insert-media-button"' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<button type="button"%s class="button insert-media add_media" data-editor="%s">%s</button>',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -767,7 +767,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $attachment['image_alt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_unslash( $attachment['image_alt'] );
</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 ( $image_alt != get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_meta( $attachment_id, '_wp_attachment_image_alt', true ) !== $image_alt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_strip_all_tags( $image_alt, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // update_post_meta() expects slashed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -947,7 +947,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['tab'] ) && $_GET['tab'] == 'type_url' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['tab'] ) && 'type_url' === $_GET['tab'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'image';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,7 +1003,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> @unlink( $file_array['tmp_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> return $id;
</span><span class="cx" style="display: block; padding: 0 10px"> // If attachment id was requested, return it early.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $return === 'id' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'id' === $return ) {
</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">@@ -1012,7 +1012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Finally, check to make sure the file has been saved, then return the HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $src ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $return === 'src' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'src' === $return ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -1211,9 +1211,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = '';
</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 ( $url_type == 'file' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'file' === $url_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $file;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $url_type == 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $url_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $link;
</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">@@ -1324,7 +1324,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $align = ! empty( $attachment['align'] ) ? $attachment['align'] : 'none';
</span><span class="cx" style="display: block; padding: 0 10px"> $size = ! empty( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = ! empty( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rel = ( strpos( $url, 'attachment_id' ) || $url === get_attachment_link( $attachment_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = ( strpos( $url, 'attachment_id' ) || get_attachment_link( $attachment_id ) === $url );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return get_image_send_to_editor( $attachment_id, $attachment['post_excerpt'], $attachment['post_title'], $align, $url, $rel, $size, $alt );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1491,7 +1491,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id ) {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post && $post->post_type == 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post && 'attachment' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attachments = array( $post->ID => $post );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments = get_children(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1513,7 +1513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $attachments as $id => $attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $attachment->post_status == 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $attachment->post_status ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1735,7 +1735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_fields = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $form_fields as $id => $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id[0] == '_' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '_' === $id[0] ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1747,7 +1747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field = array_merge( $defaults, $field );
</span><span class="cx" style="display: block; padding: 0 10px"> $name = "attachments[$attachment_id][$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 ( $field['input'] == 'hidden' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hidden' === $field['input'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hidden_fields[ $name ] = $field['value'];
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,7 +1761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $field[ $field['input'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item .= $field[ $field['input'] ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $field['input'] == 'textarea' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'textarea' === $field['input'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_content' == $id && user_can_richedit() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitize_post() skips the post_content when user_can_richedit.
</span><span class="cx" style="display: block; padding: 0 10px"> $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1919,7 +1919,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $item = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $form_fields as $id => $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id[0] == '_' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '_' === $id[0] ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1937,7 +1937,7 @@
</span><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 ( $field['input'] == 'hidden' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hidden' === $field['input'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hidden_fields[ $name ] = $field['value'];
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1954,7 +1954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $field[ $field['input'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $item .= $field[ $field['input'] ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $field['input'] == 'textarea' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'textarea' === $field['input'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_content' == $id && user_can_richedit() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // sanitize_post() skips the post_content when user_can_richedit.
</span><span class="cx" style="display: block; padding: 0 10px"> $field['value'] = htmlspecialchars( $field['value'], ENT_QUOTES );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2716,7 +2716,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_GET['post_mime_type'] = $type;
</span><span class="cx" style="display: block; padding: 0 10px"> list($post_mime_types, $avail_post_mime_types) = wp_edit_attachments_query();
</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['post_mime_type'] ) || $_GET['post_mime_type'] == 'all' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_GET['post_mime_type'] ) || 'all' === $_GET['post_mime_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class = ' class="current"';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2800,7 +2800,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $arc_result as $arc_row ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $arc_row->yyear == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $arc_row->yyear ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2926,13 +2926,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="align image-only">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row" class="label"><p><label for="align">' . __( 'Alignment' ) . '</label></p></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td class="field">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'none' ? ' checked="checked"' : '' ) . ' />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="align" id="align-none" value="none" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'none' === $default_align ? ' checked="checked"' : '' ) . ' />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="align-none" class="align image-align-none-label">' . __( 'None' ) . '</label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'left' ? ' checked="checked"' : '' ) . ' />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="align" id="align-left" value="left" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'left' === $default_align ? ' checked="checked"' : '' ) . ' />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="align-left" class="align image-align-left-label">' . __( 'Left' ) . '</label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'center' ? ' checked="checked"' : '' ) . ' />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="align" id="align-center" value="center" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'center' === $default_align ? ' checked="checked"' : '' ) . ' />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="align-center" class="align image-align-center-label">' . __( 'Center' ) . '</label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( $default_align == 'right' ? ' checked="checked"' : '' ) . ' />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input name="align" id="align-right" value="right" onclick="addExtImage.align=\'align\'+this.value" type="radio"' . ( 'right' === $default_align ? ' checked="checked"' : '' ) . ' />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="align-right" class="align image-align-right-label">' . __( 'Right' ) . '</label>
</span><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3272,8 +3272,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^.*?\.(\w+)$/', get_attached_file( $post->ID ), $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_html( strtoupper( $matches[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> list( $mime_type ) = explode( '/', $post->post_mime_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $mime_type !== 'image' && ! empty( $meta['mime_type'] ) ) {
- if ( $meta['mime_type'] !== "$mime_type/" . strtolower( $matches[1] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' !== $mime_type && ! empty( $meta['mime_type'] ) ) {
+ if ( "$mime_type/" . strtolower( $matches[1] ) !== $meta['mime_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' (' . $meta['mime_type'] . ')';
</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">@@ -3535,7 +3535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $metadata['created_timestamp'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $created_timestamp = wp_get_media_creation_timestamp( $data );
</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 ( $created_timestamp !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $created_timestamp ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metadata['created_timestamp'] = $created_timestamp;
</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="trunksrcwpadminincludesmetaboxesphp"></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/meta-boxes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/meta-boxes.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Visibility:' ); ?> <span id="post-visibility-display">
</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 ( 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'private' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post->post_password = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility = 'private';
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility_trans = __( 'Private' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $post->post_password ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility = 'password';
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility_trans = __( 'Password protected' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $post_type && is_sticky( $post->ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $visibility = 'public';
</span><span class="cx" style="display: block; padding: 0 10px"> $visibility_trans = __( 'Public, Sticky' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -180,12 +180,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-visibility-select" class="hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr( $post->post_password ); ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $post_type == 'post' ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === $post_type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e( 'Public' ); ?></label><br />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $post_type == 'post' && current_user_can( 'edit_others_posts' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === $post_type && current_user_can( 'edit_others_posts' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked( is_sticky( $post->ID ) ); ?> /> <label for="sticky" class="selectit"><?php _e( 'Stick this post to the front page' ); ?></label><br /></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e( 'Password protected' ); ?></label><br />
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset id="timestampdiv" class="hide-if-js">
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php touch_time( ( $action === 'edit' ), 1 ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php touch_time( ( 'edit' === $action ), 1 ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><?php // /misc-pub-section ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -598,7 +598,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo $tax_name; ?>-all" class="tabs-panel">
</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">- $name = ( $tax_name == 'category' ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $name = ( 'category' === $tax_name ) ? 'post_category' : 'tax_input[' . $tax_name . ']';
</ins><span class="cx" style="display: block; padding: 0 10px"> // Allows for an empty term set to be sent. 0 is an invalid term ID and will be ignored by empty() checks.
</span><span class="cx" style="display: block; padding: 0 10px"> echo "<input type='hidden' name='{$name}[]' value='0' />";
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1148,13 +1148,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Target' ); ?></span></legend>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_blank" class="selectit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_blank' ) ? 'checked="checked"' : '' ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ( '_blank' === $link->link_target ) ? 'checked="checked"' : '' ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '<code>_blank</code> — new window or tab.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_top" class="selectit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '_top' ) ? 'checked="checked"' : '' ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ( '_top' === $link->link_target ) ? 'checked="checked"' : '' ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '<code>_top</code> — current window or tab, with no frames.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="link_target_none" class="selectit">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ( $link->link_target == '' ) ? 'checked="checked"' : '' ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ( '' === $link->link_target ) ? 'checked="checked"' : '' ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( '<code>_none</code> — same window or tab.' ); ?></label></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Choose the target frame for your link.' ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/misc.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -649,7 +649,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option = $_POST['wp_screen_options']['option'];
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $_POST['wp_screen_options']['value'];
</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 ( $option != sanitize_key( $option ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( sanitize_key( $option ) != $option ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -744,7 +744,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $xpath = new DOMXPath( $doc );
</span><span class="cx" style="display: block; padding: 0 10px"> $rules = $xpath->query( '/configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'wordpress\')] | /configuration/system.webServer/rewrite/rules/rule[starts-with(@name,\'WordPress\')]' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $rules->length == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $rules->length ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1289,7 +1289,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value The proposed new site admin email address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_option_new_admin_email( $old_value, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $value == get_option( 'admin_email' ) || ! is_email( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
</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></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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/ms.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $file;
</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 ( $file['error'] != '0' ) { // There's already an error.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $file['error'] ) { // There's already an error.
</ins><span class="cx" style="display: block; padding: 0 10px"> return $file;
</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">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file['error'] = __( 'You have used your space quota. Please delete files before uploading.' );
</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 ( $file['error'] != '0' && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $file['error'] && ! isset( $_POST['html-upload'] ) && ! wp_doing_ajax() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( $file['error'] . ' <a href="javascript:history.go(-1)">' . __( 'Back' ) . '</a>' );
</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">@@ -548,7 +548,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * if `$taxonomy` is 'category' or 'post_tag'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sync_category_tag_slugs( $term, $taxonomy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( global_terms_enabled() && ( $taxonomy == 'category' || $taxonomy == 'post_tag' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( global_terms_enabled() && ( 'category' === $taxonomy || 'post_tag' === $taxonomy ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $term ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term->slug = sanitize_title( $term->name );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -644,11 +644,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $lang_files as $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $code_lang = basename( $val, '.mo' );
</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 ( $code_lang == 'en_US' ) { // American English.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en_US' === $code_lang ) { // American English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $flag = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $ae = __( 'American English' );
</span><span class="cx" style="display: block; padding: 0 10px"> $output[ $ae ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $code_lang == 'en_GB' ) { // British English.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'en_GB' === $code_lang ) { // British English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $flag = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $be = __( 'British English' );
</span><span class="cx" style="display: block; padding: 0 10px"> $output[ $be ] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $flag === false ) { // WordPress English.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $flag ) { // WordPress English.
</ins><span class="cx" style="display: block; padding: 0 10px"> $output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . '</option>';
</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">@@ -725,10 +725,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</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 ( $data['post_type'] != 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' !== $data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $data;
</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( $data['post_name'] ) || $data['post_name'] == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $data['post_name'] ) || '' === $data['post_name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_main_site() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +813,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if network can be edited, otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function can_edit_network( $network_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $network_id == get_current_network_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_network_id() == $network_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -873,7 +873,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $allusers = (array) $_POST['allusers'];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $allusers as $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user_id != '' && $user_id != '0' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $user_id && '0' != $user_id ) {
</ins><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 class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'delete_user', $delete_user->ID ) ) {
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,7 +1266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Build the new array value from leaf to trunk.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = count( $array_bits ) - 1; $i >= 0; $i-- ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $i == count( $array_bits ) - 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( count( $array_bits ) - 1 == $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_post_data[ $array_bits[ $i ] ] = wp_slash( $post_input_data->value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_post_data = array( $array_bits[ $i ] => $new_post_data );
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/plugin.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1834,7 +1834,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent;
</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 ( $pagenow == 'admin.php' && isset( $plugin_page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'admin.php' === $pagenow && isset( $plugin_page ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu as $parent_menu ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parent_menu[2] == $plugin_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $plugin_page;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1866,7 +1866,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_wp_real_parent_file[ $parent ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = $_wp_real_parent_file[ $parent ];
</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( $typenow ) && ( $submenu_array[2] == "$pagenow?post_type=$typenow" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $typenow ) && ( "$pagenow?post_type=$typenow" === $submenu_array[2] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $submenu_array[2] == $pagenow && empty( $typenow ) && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1935,7 +1935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ( $parent == $pagenow ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( $parent == $plugin_page ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( $plugin_page == $hook ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $pagenow == 'admin.php' && $parent1 != $submenu_array[2] ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( 'admin.php' === $pagenow && $parent1 != $submenu_array[2] ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> ( ! empty( $typenow ) && $parent == $pagenow . '?post_type=' . $typenow )
</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">@@ -1960,7 +1960,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $menu as $menu_array ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $plugin_page ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ( $plugin_page == $menu_array[2] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $pagenow == 'admin.php' ) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( 'admin.php' === $pagenow ) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ( $parent1 == $menu_array[2] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $menu_array[3];
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_array[3];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2156,7 +2156,7 @@
</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_option_whitelist( $new_options, $options = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $options == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $options ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $whitelist_options;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options = $options;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2169,7 +2169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options[ $page ][] = $key;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = array_search( $key, $whitelist_options[ $page ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pos === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options[ $page ][] = $key;
</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">@@ -2191,7 +2191,7 @@
</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 remove_option_whitelist( $del_options, $options = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $options == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $options ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $whitelist_options;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options = $options;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2201,7 +2201,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $keys as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $whitelist_options[ $page ] ) && is_array( $whitelist_options[ $page ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pos = array_search( $key, $whitelist_options[ $page ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pos !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $whitelist_options[ $page ][ $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="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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/post.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['saveasprivate'] ) && '' != $post_data['saveasprivate'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'private';
</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['publish'] ) && ( '' != $post_data['publish'] ) && ( ! isset( $post_data['post_status'] ) || $post_data['post_status'] != 'private' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['publish'] ) && ( '' != $post_data['publish'] ) && ( ! isset( $post_data['post_status'] ) || 'private' !== $post_data['post_status'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['advanced'] ) && '' != $post_data['advanced'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['_wp_attachment_image_alt'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
</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 ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) !== $image_alt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $image_alt = wp_strip_all_tags( $image_alt, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // update_post_meta() expects slashed.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1452,7 +1452,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"> // Encourage a pretty permalink setting.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && ! ( 'page' == get_option( 'show_on_front' ) && $id == get_option( 'page_on_front' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && ! ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __( 'Change Permalinks' ) . "</a></span>\n";
</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">@@ -1596,7 +1596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/ajax-actions.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $time_window = apply_filters( 'wp_check_post_lock_window', 150 );
</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 ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $time && $time > time() - $time_window && get_current_user_id() != $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $user;
</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">@@ -1951,7 +1951,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'draft';
</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_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' !== $post_data['post_type'] && ! empty( $post_data['catslist'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_category'] = explode( ',', $post_data['catslist'] );
</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="trunksrcwpadminincludesprivacytoolsphp"></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/privacy-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/privacy-tools.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/privacy-tools.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -694,7 +694,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If we are not yet on the last page of the last exporter, return now.
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/ajax-actions.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $exporters = apply_filters( 'wp_privacy_personal_data_exporters', array() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_last_exporter = $exporter_index === count( $exporters );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_last_exporter = count( $exporters ) === $exporter_index;
</ins><span class="cx" style="display: block; padding: 0 10px"> $exporter_done = $response['done'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_last_exporter || ! $exporter_done ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $response;
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -432,7 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_list_table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $mode == 'single' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'single' === $mode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Comments_List_Table' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2195,12 +2195,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image = get_header_image();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Display "Header Image" if the image was ever used as a header image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $meta_header ) && $meta_header == $stylesheet && $header_image !== wp_get_attachment_url( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta_header ) && $meta_header === $stylesheet && wp_get_attachment_url( $post->ID ) !== $header_image ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Header Image' );
</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"> // Display "Current Header Image" if the image is currently the header image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $header_image && $header_image == wp_get_attachment_url( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $header_image && wp_get_attachment_url( $post->ID ) === $header_image ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Current Header Image' );
</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">@@ -2209,21 +2209,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'custom-background' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_background = get_post_meta( $post->ID, '_wp_attachment_is_custom_background', 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">- if ( ! empty( $meta_background ) && $meta_background == $stylesheet ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $meta_background ) && $meta_background === $stylesheet ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Background Image' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $background_image = get_background_image();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $background_image && $background_image == wp_get_attachment_url( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $background_image && wp_get_attachment_url( $post->ID ) === $background_image ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Current Background Image' );
</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><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 == get_option( 'site_icon' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'site_icon' ) == $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Site Icon' );
</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 == get_theme_mod( 'custom_logo' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_theme_mod( 'custom_logo' ) == $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $media_states[] = __( 'Logo' );
</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="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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/update.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -56,7 +56,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = $from_api->updates;
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $updates as $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $update->response == 'autoupdate' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'autoupdate' === $update->response ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cur = get_preferred_from_update_core();
</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( $cur->response ) || $cur->response != 'upgrade' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $cur->response ) || 'upgrade' !== $cur->response ) {
</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">@@ -337,7 +337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'update_core' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cur = get_preferred_from_update_core();
</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( $cur->response ) && $cur->response == 'upgrade' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $cur->response ) && 'upgrade' === $cur->response ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $msg .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" class="button" aria-describedby="wp-version">%s</a> ',
</span><span class="cx" style="display: block; padding: 0 10px"> network_admin_url( 'update-core.php' ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -161,7 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( global_terms_enabled() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $cat_id == null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null == $cat_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->sitecategories,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -495,7 +495,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Delete any caps that snuck into the previously active blog. (Hardcoded to blog 1 for now.)
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Get previous_blog_id.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_super_admin( $user_id ) && $user_id != 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_super_admin( $user_id ) && 1 != $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->delete(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->usermeta,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -566,7 +566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $response = wp_remote_get( $test_url, array( 'timeout' => 5 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $x_pingback_header = wp_remote_retrieve_header( $response, 'x-pingback' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pretty_permalinks = $x_pingback_header && $x_pingback_header === get_bloginfo( 'pingback_url' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pretty_permalinks = $x_pingback_header && get_bloginfo( 'pingback_url' ) === $x_pingback_header;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pretty_permalinks ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1127,22 +1127,22 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $user->user_idmode ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $idmode = $user->user_idmode;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $idmode == 'nickname' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'nickname' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_nickname;
</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 ( $idmode == 'login' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'login' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_login;
</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 ( $idmode == 'firstname' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'firstname' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_firstname;
</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 ( $idmode == 'lastname' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'lastname' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_lastname;
</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 ( $idmode == 'namefl' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'namefl' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_firstname . ' ' . $user->user_lastname;
</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 ( $idmode == 'namelf' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'namelf' === $idmode ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $id = $user->user_lastname . ' ' . $user->user_firstname;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $idmode ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2249,7 +2249,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"> // 4.2
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_current_db_version < 31351 && $wpdb->charset === 'utf8mb4' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_current_db_version < 31351 && 'utf8mb4' === $wpdb->charset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp_should_upgrade_global_tables() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE $wpdb->usermeta DROP INDEX meta_key, ADD INDEX meta_key(meta_key(191))" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE $wpdb->site DROP INDEX domain, ADD INDEX domain(domain(140),path(51))" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2499,21 +2499,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function __get_option( $setting ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionDoubleUnderscore,PHPCompatibility.FunctionNameRestrictions.ReservedFunctionNames.FunctionDoubleUnderscore
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( $setting == 'home' && defined( 'WP_HOME' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'home' === $setting && defined( 'WP_HOME' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return untrailingslashit( WP_HOME );
</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 ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'siteurl' === $setting && defined( 'WP_SITEURL' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return untrailingslashit( WP_SITEURL );
</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"> $option = $wpdb->get_var( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s", $setting ) );
</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 ( 'home' == $setting && '' == $option ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'home' === $setting && '' == $option ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return __get_option( 'siteurl' );
</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 ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting || 'tag_base' == $setting ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'siteurl' === $setting || 'home' === $setting || 'category_base' === $setting || 'tag_base' === $setting ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option = untrailingslashit( $option );
</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">@@ -2861,7 +2861,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'fieldname' => $tableindex->Column_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'subpart' => $tableindex->Sub_part,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index_ary[ $keyname ]['unique'] = ( $tableindex->Non_unique == 0 ) ? true : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_ary[ $keyname ]['unique'] = ( 0 == $tableindex->Non_unique ) ? true : false;
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_ary[ $keyname ]['index_type'] = $tableindex->Index_type;
</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">@@ -2870,7 +2870,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Build a create string to compare to the query.
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $index_name == 'primary' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'primary' === $index_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'PRIMARY ';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $index_data['unique'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= 'UNIQUE ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2889,7 +2889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For each column in the index.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $index_data['columns'] as $column_data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $index_columns != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $index_columns ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index_columns .= ',';
</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">@@ -3000,7 +3000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $files as $oldfile => $newfile ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $oldfile == 'index.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'index.php' === $oldfile ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $oldpath = $home_path;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $oldpath = ABSPATH;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3007,7 +3007,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"> // Check to make sure it's not a new index.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $oldfile == 'index.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'index.php' === $oldfile ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $index = implode( '', file( "$oldpath/$oldfile" ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! copy( WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile" ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3183,7 +3183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make the new site theme active.
</span><span class="cx" style="display: block; padding: 0 10px"> $current_template = __get_option( 'template' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $current_template == WP_DEFAULT_THEME ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( WP_DEFAULT_THEME == $current_template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'template', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'stylesheet', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/includes/user.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ( is_multisite() && current_user_can( 'manage_network_users' ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id !== get_current_user_id() ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ get_current_user_id() !== $user_id ||
</ins><span class="cx" style="display: block; padding: 0 10px"> ( $potential_role && $potential_role->has_cap( 'promote_users' ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $user->role = $new_role;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['url'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_POST['url'] ) || 'http://' === $_POST['url'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user->user_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $user->user_url = esc_url_raw( $_POST['url'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* checking that username has been typed */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user->user_login == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $user->user_login ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'user_login', __( '<strong>Error</strong>: Please enter a username.' ) );
</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="trunksrcwpadmininstallhelperphp"></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-helper.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install-helper.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/install-helper.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,19 +175,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $row->Field == $col_name ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Got our column, check the params.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $col_type != null ) && ( $row->Type != $col_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null != $col_type ) && ( $row->Type != $col_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $is_null != null ) && ( $row->Null != $is_null ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null != $is_null ) && ( $row->Null != $is_null ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( $key != null ) && ( $row->Key != $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null != $key ) && ( $row->Key != $key ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( $default != null ) && ( $row->Default != $default ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null != $default ) && ( $row->Default != $default ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</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 ( ( $extra != null ) && ( $row->Extra != $extra ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( null != $extra ) && ( $row->Extra != $extra ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ++$diffs;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diffs > 0 ) {
</span></span></pre></div>
<a id="trunksrcwpadminmenuphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/menu.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_merge( $builtin, $types ) as $ptype ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype_obj = get_post_type_object( $ptype );
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if it should be a submenu.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ptype_obj->show_in_menu !== true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true !== $ptype_obj->show_in_menu ) {
</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"> $ptype_menu_position = is_int( $ptype_obj->menu_position ) ? $ptype_obj->menu_position : ++$_wp_last_object_menu; // If we're to use $_wp_last_object_menu, increment it first.
</span></span></pre></div>
<a id="trunksrcwpadminmysitesphp"></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/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/my-sites.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Context of the setting (global or site-specific). Default 'global'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $settings_html = apply_filters( 'myblogs_options', '', 'global' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $settings_html != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $settings_html ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<h3>' . __( 'Global Settings' ) . '</h3>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo $settings_html;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/network/settings.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -165,7 +165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_site_option( 'new_admin_email' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $new_admin_email && $new_admin_email != get_site_option( 'admin_email' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $new_admin_email && get_site_option( 'admin_email' ) !== $new_admin_email ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,7 +257,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $limited_email_domains = str_replace( ' ', "\n", $limited_email_domains );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <textarea name="limited_email_domains" id="limited_email_domains" aria-describedby="limited-email-domains-desc" cols="45" rows="5">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php echo esc_textarea( $limited_email_domains == '' ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php echo esc_textarea( '' == $limited_email_domains ? '' : implode( "\n", (array) $limited_email_domains ) ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="limited-email-domains-desc">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'If you want to limit site registrations to certain domains. One domain per line.' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/network/site-settings.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['option'] as $key => $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_unslash( $key );
</span><span class="cx" style="display: block; padding: 0 10px"> $val = wp_unslash( $val );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key === 0 || is_array( $val ) || in_array( $key, $skip_options ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $key || is_array( $val ) || in_array( $key, $skip_options ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $key, $val );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,7 +124,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $wpdb->get_results( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $options as $option ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $option->option_name == 'default_role' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default_role' === $option->option_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editblog_default_role = $option->option_value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $disabled = false;
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/network/sites.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,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"> $updated_action = 'not_deleted';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id != '0' && $id != get_network()->site_id && current_user_can( 'delete_site', $id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $id && get_network()->site_id != $id && current_user_can( 'delete_site', $id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wpmu_delete_blog( $id, true );
</span><span class="cx" style="display: block; padding: 0 10px"> $updated_action = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +153,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['site_ids'] as $site_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = (int) $site_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 ( $site_id == get_network()->site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network()->site_id == $site_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -178,10 +178,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'allblogs':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allblogs'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['allblogs'] as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $val != '0' && $val != get_network()->site_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $val && get_network()->site_id != $val ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'delete':
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/network/users.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,7 +27,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'deleteuser' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $_GET['id'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $id != '0' && $id != '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' != $id && '1' != $id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle arrays.
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Users' );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'users.php';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,7 +49,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $_POST['action'] ) || isset( $_POST['action2'] ) ) && isset( $_POST['allusers'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-users-network' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $doaction = $_POST['action'] != -1 ? $_POST['action'] : $_POST['action2'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $doaction = -1 != $_POST['action'] ? $_POST['action'] : $_POST['action2'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $userfunction = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['allusers'] as $user_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $details ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $details->userblog_id != get_network()->site_id ) { // Main blog is not a spam!
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network()->site_id != $details->userblog_id ) { // Main blog is not a spam!
</ins><span class="cx" style="display: block; padding: 0 10px"> update_blog_status( $details->userblog_id, 'spam', '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">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $i == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $i ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $deletefunction = 'delete';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $deletefunction = 'all_delete';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-header.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 ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( $_REQUEST['action'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['updated'] ) && 'true' == $_REQUEST['updated'] && ! empty( $_REQUEST['action'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible"><p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/options-general.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this, we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $new_admin_email = get_option( 'new_admin_email' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $new_admin_email && get_option( 'admin_email' ) !== $new_admin_email ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="updated inline">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,7 +183,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"> // Add note about deprecated WPLANG constant.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && WPLANG !== $locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'define()',
</span><span class="cx" style="display: block; padding: 0 10px"> '4.0.0',
</span></span></pre></div>
<a id="trunksrcwpadminpostnewphp"></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-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post-new.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/post-new.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</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"> $submenu_file = "post-new.php?post_type=$post_type";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_type_object ) && $post_type_object->show_in_menu && $post_type_object->show_in_menu !== true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_type_object ) && $post_type_object->show_in_menu && true !== $post_type_object->show_in_menu ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $post_type_object->show_in_menu;
</span><span class="cx" style="display: block; padding: 0 10px"> // What if there isn't a post-new.php item for this post type?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_registered_pages[ get_plugin_page_hookname( "post-new.php?post_type=$post_type", $post_type_object->show_in_menu ) ] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadmintoolsphp"></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/tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/tools.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-admin/tools.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,10 +9,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['page'] ) && ! empty( $_POST ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Ensure POST-ing to `tools.php?page=export_personal_data` and `tools.php?page=remove_personal_data`
</span><span class="cx" style="display: block; padding: 0 10px"> // continues to work after creating the new files for exporting and erasing of personal data.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $_GET['page'] === 'export_personal_data' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'export_personal_data' === $_GET['page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/export-personal-data.php';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $_GET['page'] === 'remove_personal_data' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'remove_personal_data' === $_GET['page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/erase-personal-data.php';
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -27,10 +27,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['page'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // These were also moved to files in WP 5.3.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $_GET['page'] === 'export_personal_data' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'export_personal_data' === $_GET['page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'export-personal-data.php' ), 301 );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $_GET['page'] === 'remove_personal_data' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'remove_personal_data' === $_GET['page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'erase-personal-data.php' ), 301 );
</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="trunksrcwpcontentthemestwentyelevenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/functions.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-content/themes/twentyeleven/functions.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_color = get_header_textcolor();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no custom options for text are set, let's bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $text_color == HEADER_TEXTCOLOR ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( HEADER_TEXTCOLOR == $text_color ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +416,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $color = get_header_textcolor();
</span><span class="cx" style="display: block; padding: 0 10px"> $image = get_header_image();
</span><span class="cx" style="display: block; padding: 0 10px"> $style = 'display: none;';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $color && $color != 'blank' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $color && 'blank' !== $color ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $style = 'color: #' . $color . ';';
</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="trunksrcwpcontentthemestwentyfourteeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/custom-header.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_color = get_header_textcolor();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no custom color for text is set, let's bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( display_header_text() && $text_color === get_theme_support( 'custom-header', 'default-text-color' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( display_header_text() && get_theme_support( 'custom-header', 'default-text-color' ) === $text_color ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</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 the user has set a custom color for the text, use that.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( get_theme_support( 'custom-header', 'default-text-color' ) != $text_color ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> .site-title a {
</span><span class="cx" style="display: block; padding: 0 10px"> color: #<?php echo esc_attr( $text_color ); ?>;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteeninccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-content/themes/twentythirteen/inc/custom-header.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_color = get_header_textcolor();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no custom options for text are set, let's bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $header_image ) && $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $header_image ) && get_theme_support( 'custom-header', 'default-text-color' ) == $text_color ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user has set a custom color for the text, use that.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elseif ( $text_color != get_theme_support( 'custom-header', 'default-text-color' ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elseif ( get_theme_support( 'custom-header', 'default-text-color' ) != $text_color ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> .site-title,
</span><span class="cx" style="display: block; padding: 0 10px"> .site-description {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelveinccustomheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-content/themes/twentytwelve/inc/custom-header.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,7 +71,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text_color = get_header_textcolor();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no custom options for text are set, let's bail.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $text_color == get_theme_support( 'custom-header', 'default-text-color' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_theme_support( 'custom-header', 'default-text-color' ) == $text_color ) {
</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></span></pre></div>
<a id="trunksrcwpincludesbookmarktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/bookmark-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/bookmark-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= $parsed_args['link_before'];
</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 ( $bookmark->link_image != null && $parsed_args['show_images'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null != $bookmark->link_image && $parsed_args['show_images'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $bookmark->link_image, 'http' ) === 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<img src=\"$bookmark->link_image\" $alt $title />";
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // If it's a relative path.
</span></span></pre></div>
<a id="trunksrcwpincludesbookmarkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/bookmark.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/bookmark.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,11 +52,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_bookmark = sanitize_bookmark( $_bookmark, $filter );
</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 ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_bookmark;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_object_vars( $_bookmark );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_values( get_object_vars( $_bookmark ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $_bookmark;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT * $length $recently_updated_test $get_updated FROM $wpdb->links $join WHERE 1=1 $visible $category_query";
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= " $exclusions $inclusions $search";
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= " ORDER BY $orderby $order";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parsed_args['limit'] != -1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 != $parsed_args['limit'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= ' LIMIT ' . $parsed_args['limit'];
</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="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/capabilities.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/capabilities.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/capabilities.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +534,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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 ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete_term' === $cap && ( get_option( 'default_' . $term->taxonomy ) == $term->term_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</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">@@ -867,7 +867,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if the user is a site admin.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_super_admin( $user_id = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $user_id || $user_id == get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $user_id || get_current_user_id() == $user_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = wp_get_current_user();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/category-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -836,7 +836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = $args['topic_count_text'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $args['topic_count_text_callback'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Look for the alternative callback style. Ignore the previous default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default_topic_count_text' === $args['topic_count_text_callback'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of items (tags). */
</span><span class="cx" style="display: block; padding: 0 10px"> $translate_nooped_plural = _n_noop( '%s item', '%s items' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludescategoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/category.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $category_paths = explode( '/', $category_paths );
</span><span class="cx" style="display: block; padding: 0 10px"> $full_path = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $category_paths as $pathdir ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $full_path .= ( $pathdir != '' ? '/' : '' ) . sanitize_title( $pathdir );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $full_path .= ( '' != $pathdir ? '/' : '' ) . sanitize_title( $pathdir );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = get_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $categories as $category ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = '/' . $leaf_path;
</span><span class="cx" style="display: block; padding: 0 10px"> $curcategory = $category;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( ( $curcategory->parent != 0 ) && ( $curcategory->parent != $curcategory->term_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( ( 0 != $curcategory->parent ) && ( $curcategory->parent != $curcategory->term_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $curcategory = get_term( $curcategory->parent, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $curcategory ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $curcategory;
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-http.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Browser compatibility.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $original->status_code === 302 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 302 === $original->status_code ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $options['type'] = Requests::GET;
</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="trunksrcwpincludesclasswalkerpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-walker-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-page.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-walker-page.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $_current_page && $page->ID == $_current_page->post_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_parent';
</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 ( $page->ID == get_option( 'page_for_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( get_option( 'page_for_posts' ) == $page->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_class[] = 'current_page_parent';
</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="trunksrcwpincludesclasswpadminbarphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-admin-bar.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-admin-bar.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,7 +318,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->_get_nodes() as $node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'root' == $node->id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'root' === $node->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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,9 +329,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"> // Generate the group class (we distinguish between top level and other level groups).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $group_class = ( $node->parent == 'root' ) ? 'ab-top-menu' : 'ab-submenu';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $group_class = ( 'root' === $node->parent ) ? 'ab-top-menu' : 'ab-submenu';
</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 ( $node->type == 'group' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'group' === $node->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $node->meta['class'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $node->meta['class'] = $group_class;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,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"> // Items in items aren't allowed. Wrap nested items in 'default' groups.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parent->type == 'item' && $node->type == 'item' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'item' === $parent->type && 'item' === $node->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_id = $parent->id . '-default';
</span><span class="cx" style="display: block; padding: 0 10px"> $default = $this->_get_node( $default_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Groups in groups aren't allowed. Add a special 'container' node.
</span><span class="cx" style="display: block; padding: 0 10px"> // The container will invisibly wrap both groups.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $parent->type == 'group' && $node->type == 'group' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'group' === $parent->type && 'group' === $node->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $container_id = $parent->id . '-container';
</span><span class="cx" style="display: block; padding: 0 10px"> $container = $this->_get_node( $container_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +398,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $container->parent = $grandparent->id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $index = array_search( $parent, $grandparent->children, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $index === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $index ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $grandparent->children[] = $container;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> array_splice( $grandparent->children, $index, 1, array( $container ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $node
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function _render_container( $node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $node->type != 'container' || empty( $node->children ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'container' !== $node->type || empty( $node->children ) ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -484,11 +484,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $node
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function _render_group( $node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $node->type == 'container' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'container' === $node->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->_render_container( $node );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 ( $node->type != 'group' || empty( $node->children ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'group' !== $node->type || empty( $node->children ) ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object $node
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> final protected function _render_item( $node ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $node->type != 'item' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'item' !== $node->type ) {
</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></span></pre></div>
<a id="trunksrcwpincludesclasswpcommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-comment-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment-query.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1138,11 +1138,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"> $parsed = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->query_vars['meta_key'] === $orderby || 'meta_value' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $orderby == 'meta_value_num' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'meta_value_num' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->commentmeta.meta_value+0";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $orderby == 'comment__in' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'comment__in' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, $allowed_keys ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1007,7 +1007,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'temp_id' => isset( $args['_temp_id'] ) ? $args['_temp_id'] : null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'is_multi' => $is_multi_widget,
</span><span class="cx" style="display: block; padding: 0 10px"> 'control_tpl' => $control_tpl,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'multi_number' => ( $args['_add'] === 'multi' ) ? $args['_multi_num'] : false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'multi_number' => ( 'multi' === $args['_add'] ) ? $args['_multi_num'] : false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'is_disabled' => $is_disabled,
</span><span class="cx" style="display: block; padding: 0 10px"> 'id_base' => $id_base,
</span><span class="cx" style="display: block; padding: 0 10px"> 'transport' => $this->is_widget_selective_refreshable( $id_base ) ? 'postMessage' : 'refresh',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1313,7 +1313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|void Sanitized widget instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function sanitize_widget_instance( $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $value === array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( array() === $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-editor.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -243,7 +243,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $quicktags_toolbar = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self::$this_quicktags ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && $GLOBALS['current_screen']->base === 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'content' === $editor_id && ! empty( $GLOBALS['current_screen'] ) && 'post' === $GLOBALS['current_screen']->base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $toolbar_id = 'ed_toolbar';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $toolbar_id = 'qt_' . $editor_id_attr . '_toolbar';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -743,7 +743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_template = get_page_template_slug( $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 ( $page_template !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $page_template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_template = empty( $page_template ) ? 'default' : str_replace( '.', '-', basename( $page_template, '.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $body_class .= ' page-template-' . sanitize_html_class( $page_template );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphookphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-hook.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-hook.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-hook.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,7 +281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Avoid the array_slice() if possible.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $the_['accepted_args'] == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $the_['accepted_args'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = call_user_func( $the_['function'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $the_['accepted_args'] >= $num_args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = call_user_func_array( $the_['function'], $args );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-curl.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-http-curl.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_URL, $url );
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_RETURNTRANSFER, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( $ssl_verify === true ) ? 2 : false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ curl_setopt( $handle, CURLOPT_SSL_VERIFYHOST, ( true === $ssl_verify ) ? 2 : false );
</ins><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_SSL_VERIFYPEER, $ssl_verify );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl_verify ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );
</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 ( $parsed_args['httpversion'] == '1.0' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1.0' === $parsed_args['httpversion'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpixrclientphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-ixr-client.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-ixr-client.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-http-ixr-client.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $args['headers'] = apply_filters( 'wp_http_ixr_client_headers', $args['headers'] );
</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 ( $this->timeout !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $this->timeout ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['timeout'] = $this->timeout;
</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">@@ -112,7 +112,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"> // Is the message a fault?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->message->messageType == 'fault' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'fault' === $this->message->messageType ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->error = new IXR_Error( $this->message->faultCode, $this->message->faultString );
</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="trunksrcwpincludesclasswphttpproxyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-proxy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-proxy.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-http-proxy.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check = @parse_url( $uri );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Malformed URL, can not process, but this could mean ssl, so let through anyway.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $check === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $check ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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="trunksrcwpincludesclasswphttpstreamsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-streams.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,9 +55,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $connect_host = $arrURL['host'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $secure_transport = ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $secure_transport = ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $arrURL['port'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $arrURL['scheme'] == 'ssl' || $arrURL['scheme'] == 'https' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ssl' === $arrURL['scheme'] || 'https' === $arrURL['scheme'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $arrURL['port'] = 443;
</span><span class="cx" style="display: block; padding: 0 10px"> $secure_transport = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -390,7 +390,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $match_against = preg_split( '/,\s*/', $cert['extensions']['subjectAltName'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $match_against as $match ) {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $match_type, $match_host ) = explode( ':', $match );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $host_type == strtolower( trim( $match_type ) ) ) { // IP: or DNS:
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strtolower( trim( $match_type ) ) === $host_type ) { // IP: or DNS:
</ins><span class="cx" style="display: block; padding: 0 10px"> $certificate_hostnames[] = strtolower( trim( $match_host ) );
</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="trunksrcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-imagick.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-image-editor-imagick.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // setIteratorIndex is optional unless mime is an animated format.
</span><span class="cx" style="display: block; padding: 0 10px"> // Here, we just say no if you are missing it and aren't loading a jpeg.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type !== 'image/jpeg' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && 'image/jpeg' !== $mime_type ) {
</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="trunksrcwpincludesclasswpimageeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,7 +418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $orientation = apply_filters( 'wp_image_maybe_exif_rotate', $orientation, $this->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 ( ! $orientation || $orientation === 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $orientation || 1 === $orientation ) {
</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="trunksrcwpincludesclasswpnetworkqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-network-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network-query.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-network-query.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,10 +545,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"> $parsed = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $orderby == 'network__in' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'network__in' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $network__in = implode( ',', array_map( 'absint', $this->query_vars['network__in'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "FIELD( {$wpdb->site}.id, $network__in )";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $orderby == 'domain_length' || $orderby == 'path_length' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'domain_length' === $orderby || 'path_length' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = substr( $orderby, 0, -7 );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "CHAR_LENGTH($wpdb->site.$field)";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, $allowed_keys ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-query.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -910,7 +910,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $tax_query );
</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( $qv['author'] ) || ( $qv['author'] == '0' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $qv['author'] ) || ( '0' == $qv['author'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_author = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_author = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1017,25 +1017,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->queried_object );
</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 ( 'page' == get_option( 'show_on_front' ) && isset( $this->queried_object_id ) && $this->queried_object_id == get_option( 'page_for_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === get_option( 'show_on_front' ) && isset( $this->queried_object_id ) && get_option( 'page_for_posts' ) == $this->queried_object_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_page = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_posts_page = 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">- if ( isset( $this->queried_object_id ) && $this->queried_object_id == get_option( 'wp_page_for_privacy_policy' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->queried_object_id ) && get_option( 'wp_page_for_privacy_policy' ) == $this->queried_object_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_privacy_policy = true;
</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><span class="cx" style="display: block; padding: 0 10px"> if ( $qv['page_id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == get_option( 'show_on_front' ) && $qv['page_id'] == get_option( 'page_for_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) == $qv['page_id'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_page = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_posts_page = 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">- if ( $qv['page_id'] == get_option( 'wp_page_for_privacy_policy' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'wp_page_for_privacy_policy' ) == $qv['page_id'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_privacy_policy = 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">@@ -1377,7 +1377,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $q['search_terms'] as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If there is an $exclusion_prefix, terms prefixed with it should be excluded.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exclude = $exclusion_prefix && ( $exclusion_prefix === substr( $term, 0, 1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exclude = $exclusion_prefix && ( substr( $term, 0, 1 ) === $exclusion_prefix );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $exclude ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $like_op = 'NOT LIKE';
</span><span class="cx" style="display: block; padding: 0 10px"> $andor_op = 'AND';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1861,11 +1861,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['showposts'] = (int) $q['showposts'];
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = $q['showposts'];
</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( $q['posts_per_archive_page'] ) && $q['posts_per_archive_page'] != 0 ) && ( $this->is_archive || $this->is_search ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( isset( $q['posts_per_archive_page'] ) && 0 != $q['posts_per_archive_page'] ) && ( $this->is_archive || $this->is_search ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = $q['posts_per_archive_page'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $q['nopaging'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $q['posts_per_page'] == -1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 == $q['posts_per_page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['nopaging'] = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['nopaging'] = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1884,15 +1884,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = (int) $q['posts_per_page'];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['posts_per_page'] < -1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = abs( $q['posts_per_page'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $q['posts_per_page'] == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 == $q['posts_per_page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = 1;
</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( $q['comments_per_page'] ) || $q['comments_per_page'] == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $q['comments_per_page'] ) || 0 == $q['comments_per_page'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['comments_per_page'] = get_option( 'comments_per_page' );
</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 ( $this->is_home && ( empty( $this->query ) || $q['preview'] == 'true' ) && ( 'page' == get_option( 'show_on_front' ) ) && get_option( 'page_on_front' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_home && ( empty( $this->query ) || 'true' === $q['preview'] ) && ( 'page' === get_option( 'show_on_front' ) ) && get_option( 'page_on_front' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_page = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_home = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $q['page_id'] = get_option( 'page_on_front' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2096,7 +2096,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 ( $q['page_id'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'page' != get_option( 'show_on_front' ) ) || ( $q['page_id'] != get_option( 'page_for_posts' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'page' !== get_option( 'show_on_front' ) ) || ( get_option( 'page_for_posts' ) != $q['page_id'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['p'] = $q['page_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2135,7 +2135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array_keys( $this->tax_query->queried_terms );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $object_taxonomies = 'attachment' === $pt ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( array_intersect( $taxonomies, $object_taxonomies ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type[] = $pt;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2214,7 +2214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Author/user stuff.
</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( $q['author'] ) && $q['author'] != '0' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $q['author'] ) && '0' != $q['author'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $authors as $author ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3290,7 +3290,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->in_the_loop = 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">- if ( $this->current_post == -1 ) { // Loop has just started.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 == $this->current_post ) { // Loop has just started.
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires once the loop is started.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3380,7 +3380,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = $this->next_comment();
</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 ( $this->current_comment == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $this->current_comment ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires once the comment loop is started.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4300,7 +4300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Force full post content when viewing the permalink for the $post,
</span><span class="cx" style="display: block; padding: 0 10px"> * or when on an RSS feed. Otherwise respect the 'more' tag.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_queried_object_id() === $post->ID && ( $this->is_page() || $this->is_single() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $more = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $this->is_feed() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $more = 1;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-rewrite.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,7 +920,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the structure, minus any cruft (stuff that isn't tags) at the front.
</span><span class="cx" style="display: block; padding: 0 10px"> $structure = $permalink_structure;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $front != '/' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' !== $front ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $structure = str_replace( $front, '', $structure );
</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">@@ -1909,7 +1909,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $category_base Category permalink structure base.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_category_base( $category_base ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $category_base != get_option( 'category_base' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'category_base' ) !== $category_base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'category_base', $category_base );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->init();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1927,7 +1927,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag_base Tag permalink structure base.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_tag_base( $tag_base ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $tag_base != get_option( 'tag_base' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'tag_base' ) !== $tag_base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'tag_base', $tag_base );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->init();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswprolesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-roles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-roles.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-roles.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -356,7 +356,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $wp_user_roles;
</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 ( is_multisite() && $this->site_id != get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() != $this->site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'switch_blog', 'wp_switch_roles_and_user', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $roles = get_blog_option( $this->site_id, $this->role_key, array() );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsimplepiesanitizeksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-simplepie-sanitize-kses.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $type & ( SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = wp_kses_post( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->output_encoding !== 'UTF-8' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'UTF-8' !== $this->output_encoding ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $this->registry->call( 'Misc', 'change_encoding', array( $data, 'UTF-8', $this->output_encoding ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $data;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-theme.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1516,7 +1516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_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">- $current = $blog_id == get_current_blog_id();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_current_blog_id() == $blog_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $current ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-user.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_role_caps() {
</span><span class="cx" style="display: block; padding: 0 10px"> $switch_site = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && $this->site_id != get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() != $this->site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $switch_site = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $this->site_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $role Role name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_role( $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == count( $this->roles ) && current( $this->roles ) == $role ) {
</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></span></pre></div>
<a id="trunksrcwpincludesclasswpwalkerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-walker.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-walker.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-walker.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +144,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->start_el( $output, $element, $depth, ...array_values( $args ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Descend only when the depth is right and there are childrens for this element.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $max_depth == 0 || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 0 == $max_depth || $max_depth > $depth + 1 ) && isset( $children_elements[ $id ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_elements[ $id ] as $child ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If we are displaying all levels, and remaining children_elements is not empty,
</span><span class="cx" style="display: block; padding: 0 10px"> * then we got orphans, which should be displayed regardless.
</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 ( ( $max_depth == 0 ) && count( $children_elements ) > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 0 == $max_depth ) && count( $children_elements ) > 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $empty_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $children_elements as $orphans ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orphans as $op ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -696,7 +696,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $blogs as $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't include blogs that aren't hosted at this site.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog->site_id != get_current_network_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_network_id() != $blog->site_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -827,7 +827,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return IXR_Date IXR_Date object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _convert_date( $date ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $date === '0000-00-00 00:00:00' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $date ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Date( '00000000T00:00:00Z' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Date( mysql2date( 'Ymd\TH:i:s', $date, false ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -841,7 +841,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return IXR_Date IXR_Date object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _convert_date_gmt( $date_gmt, $date ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $date !== '0000-00-00 00:00:00' && $date_gmt === '0000-00-00 00:00:00' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' !== $date && '0000-00-00 00:00:00' === $date_gmt ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Date( get_gmt_from_date( mysql2date( 'Y-m-d H:i:s', $date, false ), 'Ymd\TH:i:s' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->_convert_date( $date_gmt );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,7 +879,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_order' => intval( $post['menu_order'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => $post['comment_status'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'ping_status' => $post['ping_status'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sticky' => ( $post['post_type'] === 'post' && is_sticky( $post['ID'] ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sticky' => ( 'post' === $post['post_type'] && is_sticky( $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"> // Thumbnail.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,7 +891,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"> // Consider future posts as published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_fields['post_status'] === 'future' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' === $post_fields['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_fields['post_status'] = 'publish';
</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">@@ -1286,7 +1286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * since _insert_post() will ignore the non-GMT date if the GMT date is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $content_struct['post_date_gmt'] ) && ! ( $content_struct['post_date_gmt'] instanceof IXR_Date ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $content_struct['post_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $content_struct['post_date_gmt'] || isset( $content_struct['post_date'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $content_struct['post_date_gmt'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $content_struct['post_date_gmt'] = $this->_convert_date( $content_struct['post_date_gmt'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1401,7 +1401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this 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 ( $post_data['post_type'] != get_post_type( $post_data['ID'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_post_type( $post_data['ID'] ) !== $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'The post type may not be changed.' ) );
</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">@@ -1451,11 +1451,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_author'] = $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 ( isset( $post_data['comment_status'] ) && $post_data['comment_status'] != 'open' && $post_data['comment_status'] != 'closed' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['comment_status'] ) && 'open' !== $post_data['comment_status'] && 'closed' !== $post_data['comment_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['comment_status'] );
</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['ping_status'] ) && $post_data['ping_status'] != 'open' && $post_data['ping_status'] != 'closed' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['ping_status'] ) && 'open' !== $post_data['ping_status'] && 'closed' !== $post_data['ping_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['ping_status'] );
</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">@@ -1483,7 +1483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = $post_data['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_data['post_type'] == 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = $this->_toggle_sticky( $post_data, $update );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $error;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1708,7 +1708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Ignore the existing GMT date if it is empty or a non-GMT date was supplied in $content_struct,
</span><span class="cx" style="display: block; padding: 0 10px"> * since _insert_post() will ignore the non-GMT date if the GMT date is set.
</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_date_gmt'] == '0000-00-00 00:00:00' || isset( $content_struct['post_date'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' === $post['post_date_gmt'] || isset( $content_struct['post_date'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post['post_date_gmt'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post['post_date_gmt'] = $this->_convert_date( $post['post_date_gmt'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2929,7 +2929,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'wp.getPage' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we found the page then format the data.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $page->ID && ( $page->post_type == 'page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $page->ID && ( 'page' === $page->post_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->_prepare_page( $page );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the page doesn't exist, indicate that.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3066,7 +3066,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the current page based on the 'page_id' and
</span><span class="cx" style="display: block; padding: 0 10px"> // make sure it is a page and not a post.
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_page = get_post( $page_id, ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $actual_page || ( $actual_page['post_type'] != 'page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $actual_page || ( 'page' !== $actual_page['post_type'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3132,7 +3132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the page data and make sure it is a page.
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_page = get_post( $page_id, ARRAY_A );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $actual_page || ( $actual_page['post_type'] != 'page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $actual_page || ( 'page' !== $actual_page['post_type'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Sorry, no such page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4238,7 +4238,7 @@
</span><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 ( $this->blog_options[ $o_name ]['readonly'] == true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true == $this->blog_options[ $o_name ]['readonly'] ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5114,7 +5114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_post = get_post( $post_ID, ARRAY_A );
</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 ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Sorry, no such 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">@@ -5123,7 +5123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to edit this 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 ( 'publish' == $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $actual_post['post_status'] && ! current_user_can( 'publish_posts' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish 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">@@ -5188,7 +5188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_post = get_post( $post_ID, ARRAY_A );
</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 ( ! $actual_post || $actual_post['post_type'] != 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $actual_post || 'post' !== $actual_post['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 404, __( 'Sorry, no such 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">@@ -5276,10 +5276,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_template = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $content_struct['post_type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $content_struct['post_type'] == 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $content_struct['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $publish ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_pages';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $content_struct['page_status'] ) && 'publish' == $content_struct['page_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $content_struct['page_status'] ) && 'publish' === $content_struct['page_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_pages';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'edit_pages';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5289,10 +5289,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $content_struct['wp_page_template'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_template = $content_struct['wp_page_template'];
</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 ( $content_struct['post_type'] == 'post' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $content_struct['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $publish ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_posts';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $content_struct['post_status'] ) && 'publish' === $content_struct['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_posts';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'edit_posts';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5306,7 +5306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $publish ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_posts';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $content_struct['post_status'] ) && 'publish' == $content_struct['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $content_struct['post_status'] ) && 'publish' === $content_struct['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = 'publish_posts';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $cap = 'edit_posts';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5513,7 +5513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $postdata['ID'] = $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only posts can be sticky.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type && isset( $content_struct['sticky'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $postdata;
</span><span class="cx" style="display: block; padding: 0 10px"> $data['sticky'] = $content_struct['sticky'];
</span><span class="cx" style="display: block; padding: 0 10px"> $error = $this->_toggle_sticky( $data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5846,7 +5846,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_input = isset( $content_struct['mt_keywords'] ) ? $content_struct['mt_keywords'] : null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $post_status || 'private' == $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post_status || 'private' === $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $post_type && ! current_user_can( 'publish_pages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! current_user_can( 'publish_posts' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5901,7 +5901,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"> // Only posts can be sticky.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_type == 'post' && isset( $content_struct['sticky'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type && isset( $content_struct['sticky'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $newpost;
</span><span class="cx" style="display: block; padding: 0 10px"> $data['sticky'] = $content_struct['sticky'];
</span><span class="cx" style="display: block; padding: 0 10px"> $data['post_type'] = 'post';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5991,7 +5991,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/class-wp-xmlrpc-server.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'metaWeblog.getPost' );
</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 ( $postdata['post_date'] != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $postdata['post_date'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_date = $this->_convert_date( $postdata['post_date'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = $this->_convert_date_gmt( $postdata['post_date_gmt'], $postdata['post_date'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_modified = $this->_convert_date( $postdata['post_modified'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6024,7 +6024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_pings = ( 'open' == $postdata['ping_status'] ) ? 1 : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Consider future posts as published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $postdata['post_status'] === 'future' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' === $postdata['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $postdata['post_status'] = 'publish';
</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">@@ -6041,7 +6041,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosure = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) get_post_custom( $post_ID ) as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key == 'enclosure' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enclosure' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $val as $enc ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $encdata = explode( "\n", $enc );
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosure['url'] = trim( htmlspecialchars( $encdata[0] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6176,7 +6176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_pings = ( 'open' == $entry['ping_status'] ) ? 1 : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Consider future posts as published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $entry['post_status'] === 'future' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' === $entry['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry['post_status'] = 'publish';
</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">@@ -6213,7 +6213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wp_post_format' => $post_format,
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_modified' => $post_modified,
</span><span class="cx" style="display: block; padding: 0 10px"> 'date_modified_gmt' => $post_modified_gmt,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'sticky' => ( $entry['post_type'] === 'post' && is_sticky( $entry['ID'] ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'sticky' => ( 'post' === $entry['post_type'] && is_sticky( $entry['ID'] ) ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'wp_post_thumbnail' => get_post_thumbnail_id( $entry['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">@@ -6839,7 +6839,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 33, __( 'The specified target URL cannot be used as a target. It either doesn’t exist, or it is not a pingback-enabled resource.' ) );
</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 == url_to_postid( $pagelinkedfrom ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( url_to_postid( $pagelinkedfrom ) == $post_ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->pingback_error( 0, __( 'The source URL and the target URL cannot both point to the same resource.' ) );
</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="trunksrcwpincludesclasswpscriptsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-scripts.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class.wp-scripts.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +475,7 @@
</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 localize( $handle, $object_name, $l10n ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $handle === 'jquery' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'jquery' === $handle ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $handle = 'jquery-core';
</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">@@ -521,7 +521,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Not already in the group or a lower group.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function set_group( $handle, $recursion, $group = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $this->registered[ $handle ]->args ) && $this->registered[ $handle ]->args === 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $this->registered[ $handle ]->args ) && 1 === $this->registered[ $handle ]->args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $grp = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $grp = (int) $this->get_data( $handle, 'group' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpstylesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class.wp-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class.wp-styles.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/class.wp-styles.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/class.wp-styles.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $rtl_tag = apply_filters( 'style_loader_tag', $rtl_tag, $handle, $rtl_href, $media );
</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 ( $obj->extra['rtl'] === 'replace' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'replace' === $obj->extra['rtl'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = $rtl_tag;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag .= $rtl_tag;
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/comment-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,8 +192,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
</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( $email ) ) && ( $email != '@' ) ) {
- $display = ( $linktext != '' ) ? $linktext : $email;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! empty( $email ) ) && ( '@' !== $email ) ) {
+ $display = ( '' != $linktext ) ? $linktext : $email;
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = $before;
</span><span class="cx" style="display: block; padding: 0 10px"> $return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $return .= $after;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +376,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_author_url_link( $linktext = '', $before = '', $after = '', $comment = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_comment_author_url( $comment );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $display = ( $linktext != '' ) ? $linktext : $url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $display = ( '' != $linktext ) ? $linktext : $url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://www.', '', $display );
</span><span class="cx" style="display: block; padding: 0 10px"> $display = str_replace( 'http://', '', $display );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = str_replace( '%', number_format_i18n( $number ), $more );
</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 ( $number == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 0 == $number ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Must be one.
</span><span class="cx" style="display: block; padding: 0 10px"> $output = ( false === $one ) ? __( '1 Comment' ) : $one;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2138,7 +2138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * When first page shows oldest comments, post permalink is the same as
</span><span class="cx" style="display: block; padding: 0 10px"> * the comment permalink.
</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 ( $cpage == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 == $cpage ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['cpage'] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['cpage'] = $cpage;
</span></span></pre></div>
<a id="trunksrcwpincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/comment.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * email address. If both checks pass, return true. Otherwise, return false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == get_option( 'comment_whitelist' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trackback' !== $comment_type && 'pingback' !== $comment_type && '' != $author && '' != $email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_user = get_user_by( 'email', wp_unslash( $email ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $comment_user->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE user_id = %d AND comment_approved = '1' LIMIT 1", $comment_user->ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -217,11 +217,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $_comment = apply_filters( 'get_comment', $_comment );
</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 ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_comment;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_comment->to_array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_values( $_comment->to_array() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $_comment;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1429,7 +1429,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'deleted_comment', $comment->comment_ID, $comment );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $comment->comment_post_ID;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_id && $comment->comment_approved == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_id && 1 == $comment->comment_approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_comment_count( $post_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">@@ -1655,15 +1655,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $approved = $comment->comment_approved;
</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 ( $approved == null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null == $approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $approved == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '1' == $approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'approved';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $approved == '0' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '0' == $approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'unapproved';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $approved == 'spam' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'spam' == $approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'spam';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $approved == 'trash' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' == $approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'trash';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1913,7 +1913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = (int) $wpdb->insert_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 ( $comment_approved == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $comment_approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_comment_count( $comment_post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2632,7 +2632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pingback_link_offset_squote = strpos( $contents, $pingback_str_squote );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $quote = ( $pingback_link_offset_dquote ) ? '"' : '\'';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pingback_link_offset = ( $quote == '"' ) ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pingback_link_offset = ( '"' === $quote ) ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
</ins><span class="cx" style="display: block; padding: 0 10px"> $pingback_href_pos = strpos( $contents, 'href=', $pingback_link_offset );
</span><span class="cx" style="display: block; padding: 0 10px"> $pingback_href_start = $pingback_href_pos + 6;
</span><span class="cx" style="display: block; padding: 0 10px"> $pingback_href_end = strpos( $contents, $quote, $pingback_href_start );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2843,7 +2843,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $test['query'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_links[] = $link_test;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $test['path'] ) && ( '/' !== $test['path'] ) && ( '' !== $test['path'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_links[] = $link_test;
</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">@@ -3005,7 +3005,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return IXR_Error
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function xmlrpc_pingback_error( $ixr_error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ixr_error->code === 48 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 48 === $ixr_error->code ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $ixr_error;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 0, '' );
</span></span></pre></div>
<a id="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/compat.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,7 +312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function hash_equals( $a, $b ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $a_length = strlen( $a );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $a_length !== strlen( $b ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $b ) !== $a_length ) {
</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"> $result = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return $result === 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 0 === $result;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|false Instance data array, or false if the item is marked for deletion.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_previewed && get_current_blog_id() === $this->_previewed_blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $undefined = new stdClass(); // Symbol.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = $this->post_value( $undefined );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +798,7 @@
</span><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">- if ( $nav_menu_setting->previous_term_id !== intval( $value['nav_menu_term_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( intval( $value['nav_menu_term_id'] ) !== $nav_menu_setting->previous_term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update_status = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_error = new WP_Error( 'unexpected_previous_term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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 ( $parent_nav_menu_item_setting->previous_post_id !== intval( $value['menu_item_parent'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( intval( $value['menu_item_parent'] ) !== $parent_nav_menu_item_setting->previous_post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update_status = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_error = new WP_Error( 'unexpected_previous_post_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -156,7 +156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Instance data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function value() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_previewed && $this->_previewed_blog_id === get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->is_previewed && get_current_blog_id() === $this->_previewed_blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $undefined = new stdClass(); // Symbol.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = $this->post_value( $undefined );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -384,7 +384,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array (Maybe) modified nav menu options.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function filter_nav_menu_options( $nav_menu_options ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->_previewed_blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_blog_id() !== $this->_previewed_blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $nav_menu_options;
</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">@@ -555,7 +555,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"> $post_value = $setting->post_value( null );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $post_value ) && $this->previous_term_id === intval( $post_value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_null( $post_value ) && intval( $post_value ) === $this->previous_term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->set_post_value( $setting->id, $this->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting->save();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/embed.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -613,7 +613,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sites = get_sites( $qv );
</span><span class="cx" style="display: block; padding: 0 10px"> $site = reset( $sites );
</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 ( $site && (int) $site->blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $site && get_current_blog_id() !== (int) $site->blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site->blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesfeedatomcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed-atom-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-atom-comments.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/feed-atom-comments.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -110,7 +110,7 @@
</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"> // Return comment threading information (https://www.ietf.org/rfc/rfc4685.txt).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $comment->comment_parent == 0 ) : // This comment is top-level.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $comment->comment_parent ) : // This comment is top-level.
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <thr:in-reply-to ref="<?php the_guid(); ?>" href="<?php the_permalink_rss(); ?>" type="<?php bloginfo_rss( 'html_type' ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/feed.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -471,7 +471,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) get_post_custom() as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key == 'enclosure' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enclosure' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $val as $enc ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosure = explode( "\n", $enc );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -511,7 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) get_post_custom() as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $key == 'enclosure' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enclosure' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $val as $enc ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosure = explode( "\n", $enc );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/formatting.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,7 +479,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $start = strpos( $pee_part, '<pre' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Malformed HTML?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $start === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $start ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pee .= $pee_part;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -984,10 +984,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_quote_style = $quote_style;
</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 ( $quote_style === 'double' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'double' === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $quote_style = ENT_COMPAT;
</span><span class="cx" style="display: block; padding: 0 10px"> $_quote_style = ENT_COMPAT;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $quote_style === 'single' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'single' === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $quote_style = ENT_NOQUOTES;
</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">@@ -1080,16 +1080,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '/�*26;/i' => '&',
</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 ( $quote_style === ENT_QUOTES ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ENT_QUOTES === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $translation = array_merge( $single, $double, $others );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ENT_COMPAT === $quote_style || 'double' === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $translation = array_merge( $double, $others );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_preg = array_merge( $double_preg, $others_preg );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $quote_style === 'single' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'single' === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $translation = array_merge( $single, $others );
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_preg = array_merge( $single_preg, $others_preg );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $quote_style === ENT_NOQUOTES ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ENT_NOQUOTES === $quote_style ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $translation = $others;
</span><span class="cx" style="display: block; padding: 0 10px"> $translation_preg = $others_preg;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2793,11 +2793,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address = '';
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $j = rand( 0, 1 + $hex_encoding );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $j == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= '&#' . ord( $email_address[ $i ] ) . ';';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $j == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 == $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= $email_address[ $i ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $j == 2 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 2 == $j ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[ $i ] ) ), 2 );
</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">@@ -2938,7 +2938,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nested_code_pre--;
</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 ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $nested_code_pre || empty( $piece ) || ( '<' === $piece[0] && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r .= $piece;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3552,7 +3552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function iso8601_timezone_to_offset( $timezone ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $timezone is either 'Z' or '[+|-]hhmm'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $timezone == 'Z' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'Z' === $timezone ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $offset = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sign = ( substr( $timezone, 0, 1 ) == '+' ) ? 1 : -1;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4626,7 +4626,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'default_ping_status':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'default_comment_status':
</span><span class="cx" style="display: block; padding: 0 10px"> // Options that if not there have 0 value but need to be something like "closed".
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $value == '0' || $value == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0' == $value || '' == $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = 'closed';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4972,7 +4972,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fragment = substr( $pattern, $start, $end - $start );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fragment has a specifier.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pattern[ $start ] == '%' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '%' === $pattern[ $start ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Find numbered arguments or take the next one in order.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^%(\d+)\$/', $fragment, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index = $matches[1] - 1; // 0-based array vs 1-based sprintf() arguments.
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/functions.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -686,7 +686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ';' !== substr( $data, -1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $data[0] !== 's' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 's' !== $data[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '"' !== substr( $data, -2, 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,15 +1013,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $urlencode ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $k = urlencode( $k );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_int( $k ) && $prefix != null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_int( $k ) && null != $prefix ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $k = $prefix . $k;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $key ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $k = $key . '%5B' . $k . '%5D';
</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 ( $v === null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $v ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $v === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( false === $v ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $v = '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">@@ -1132,7 +1132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $qs as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $v === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $v ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $qs[ $k ] );
</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">@@ -1539,7 +1539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the pad, if present.
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = preg_replace( '/^_+/', '', $feed );
</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 ( $feed == '' || $feed == 'feed' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $feed || 'feed' === $feed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed = get_default_feed();
</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">@@ -1885,7 +1885,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_get_raw_referer();
</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 ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) && $ref !== home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $ref && wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref && home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) !== $ref ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_validate_redirect( $ref, 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">@@ -1947,7 +1947,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $target = str_replace( '//', '/', $target );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Put the wrapper back on the target.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wrapper !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== $wrapper ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $target = $wrapper . '://' . $target;
</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">@@ -1989,7 +1989,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If a umask is set that modifies $dir_perms, we'll have to re-set
</span><span class="cx" style="display: block; padding: 0 10px"> * the $dir_perms correctly with chmod()
</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 ( $dir_perms != ( $dir_perms & ~umask() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( $dir_perms & ~umask() ) != $dir_perms ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2029,7 +2029,7 @@
</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="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strlen( $path ) == 0 || $path[0] == '.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $path ) == 0 || '.' === $path[0] ) {
</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">@@ -2039,7 +2039,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"> // A path starting with / or \ is absolute; anything else is relative.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( $path[0] == '/' || $path[0] == '\\' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( '/' === $path[0] || '\\' === $path[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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2185,7 +2185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the path is writable.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function win_is_writable( $path ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $path[ strlen( $path ) - 1 ] == '/' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' === $path[ strlen( $path ) - 1 ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If it looks like a directory, check a random file within the directory.
</span><span class="cx" style="display: block; padding: 0 10px"> return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_dir( $path ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2197,7 +2197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $should_delete_tmp_file = ! file_exists( $path );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $f = @fopen( $path, 'a' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $f === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $f ) {
</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"> fclose( $f );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2633,7 +2633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload = wp_upload_dir( $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">- if ( $upload['error'] !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $upload['error'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $upload;
</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">@@ -4321,7 +4321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // New subpattern?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $firstchar != $subchar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $subchar != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $subchar ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= ')(?=' . $spaces . '|$)'; // End previous "subpattern".
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern".
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5461,7 +5461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_id = (int) $site_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">- return $site_id === get_main_site_id( $network_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_main_site_id( $network_id ) === $site_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">@@ -5505,7 +5505,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = (int) $network_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">- return ( $network_id === get_main_network_id() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( get_main_network_id() === $network_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">@@ -7513,7 +7513,7 @@
</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 ( $max_execution_time === null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $max_execution_time ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Keep the previous behavior but attempt to prevent fatal errors from timeout if possible.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'ini_get' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_execution_time = ini_get( 'max_execution_time' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7532,7 +7532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $handle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $handle ) ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $directory . '/' . $file;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $file != '.' && $file != '..' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' !== $file && '..' !== $file ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_file( $path ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $size += filesize( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_dir( $path ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/general-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +856,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && ! empty( $blog_id ) && get_current_blog_id() !== (int) $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -924,7 +924,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function has_custom_logo( $blog_id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && ! empty( $blog_id ) && get_current_blog_id() !== (int) $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -950,7 +950,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && ! empty( $blog_id ) && get_current_blog_id() !== (int) $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1846,7 +1846,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"> $order = strtoupper( $parsed_args['order'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $order !== 'ASC' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ASC' !== $order ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = 'DESC';
</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">@@ -2006,7 +2006,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $results ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $results as $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $result->post_date != '0000-00-00 00:00:00' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '0000-00-00 00:00:00' !== $result->post_date ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $result->post_title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post-template.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2014,7 +2014,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $text = $result->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">- $selected = $result->ID === get_the_ID();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = get_the_ID() === $result->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= get_archives_link( $url, $text, $parsed_args['format'], $parsed_args['before'], $parsed_args['after'], $selected );
</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">@@ -2227,9 +2227,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $newrow = false;
</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 ( $day == current_time( 'j' ) &&
- $thismonth == current_time( 'm' ) &&
- $thisyear == current_time( 'Y' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_time( 'j' ) == $day &&
+ current_time( 'm' ) == $thismonth &&
+ current_time( 'Y' ) == $thisyear ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= '<td id="today">';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= '<td>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2257,7 +2257,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"> $pad = 7 - calendar_week_mod( gmdate( 'w', mktime( 0, 0, 0, $thismonth, $day, $thisyear ) ) - $week_begins );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pad != 0 && $pad != 7 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $pad && 7 != $pad ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= "\n\t\t" . '<td class="pad" colspan="' . esc_attr( $pad ) . '"> </td>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3960,11 +3960,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $lang = get_bloginfo( 'language' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lang ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_option( 'html_type' ) == 'text/html' || $doctype == 'html' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'text/html' === get_option( 'html_type' ) || 'html' === $doctype ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes[] = 'lang="' . esc_attr( $lang ) . '"';
</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 ( get_option( 'html_type' ) != 'text/html' || $doctype == 'xhtml' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'text/html' !== get_option( 'html_type' ) || 'xhtml' === $doctype ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attributes[] = 'xml:lang="' . esc_attr( $lang ) . '"';
</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="trunksrcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/http.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/http.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_external ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $is_external;
</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 ( $host === get_network()->domain ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_network()->domain === $host ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $queried[ $host ] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesksesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/kses.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/kses.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/kses.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,10 +1046,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow HTML comments.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '<!--' == substr( $string, 0, 4 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = str_replace( array( '<!--', '-->' ), '', $string );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( $string != ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) != $string ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string = $newstring;
</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 ( $string == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $string ) {
</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"> // Prevent multiple dashes in comments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1078,7 +1078,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"> // No attributes are allowed for closing elements.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $slash != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $slash ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return "</$elem>";
</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">@@ -1348,13 +1348,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> } // End switch.
</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 ( $working == 0 ) { // Not well-formed, remove and try again.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $working ) { // Not well-formed, remove and try again.
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr = wp_kses_html_error( $attr );
</span><span class="cx" style="display: block; padding: 0 10px"> $mode = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } // End while.
</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 ( $mode == 1 && false === array_key_exists( $attrname, $attrarr ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $mode && false === array_key_exists( $attrname, $attrarr ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Special case, for when the attribute list ends with a valueless
</span><span class="cx" style="display: block; padding: 0 10px"> // attribute like "selected".
</span><span class="cx" style="display: block; padding: 0 10px"> $attrarr[ $attrname ] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1845,10 +1845,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether or not the codepoint is a valid Unicode codepoint.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function valid_unicode( $i ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
- ( $i >= 0x20 && $i <= 0xd7ff ) ||
- ( $i >= 0xe000 && $i <= 0xfffd ) ||
- ( $i >= 0x10000 && $i <= 0x10ffff ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( 0x9 == $i || 0xa == $i || 0xd == $i ||
+ ( 0x20 <= $i && $i <= 0xd7ff ) ||
+ ( 0xe000 <= $i && $i <= 0xfffd ) ||
+ ( 0x10000 <= $i && $i <= 0x10ffff ) );
</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">@@ -2244,7 +2244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $css = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $css_array as $css_item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $css_item == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $css_item ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2282,7 +2282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trim( $url_pieces[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 ( empty( $url ) || $url !== wp_kses_bad_protocol( $url, $allowed_protocols ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $url ) || wp_kses_bad_protocol( $url, $allowed_protocols ) !== $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found = false;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2302,7 +2302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove any CSS containing containing \ ( & } = or comments, except for url() useage checked above.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $found && ! preg_match( '%[\\\(&=}]|/\*%', $css_test_string ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $css != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $css ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $css .= ';';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/l10n.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,12 +62,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ms_locale !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $ms_locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = $ms_locale;
</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"> $db_locale = get_option( 'WPLANG' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $db_locale !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $db_locale ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = $db_locale;
</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">@@ -940,7 +940,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = determine_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a path was given and the handle file exists simply return it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $file_base = $domain === 'default' ? $locale : $domain . '-' . $locale;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $file_base = 'default' === $domain ? $locale : $domain . '-' . $locale;
</ins><span class="cx" style="display: block; padding: 0 10px"> $handle_filename = $file_base . '-' . $handle . '.json';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $path ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1335,7 +1335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Array of language data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_installed_translations( $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type !== 'themes' && $type !== 'plugins' && $type !== 'core' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'themes' !== $type && 'plugins' !== $type && 'core' !== $type ) {
</ins><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">
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/link-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,9 +142,9 @@
</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 ( $post->post_type == 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_page_link( $post, $leavename, $sample );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $post->post_type == 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'attachment' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_attachment_link( $post, $leavename );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $post->post_type, get_post_types( array( '_builtin' => false ) ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_post_permalink( $post, $leavename, $sample );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_page_link( $post = false, $leavename = false, $sample = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $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 ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = _get_page_link( $post, $leavename, $sample );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,7 +422,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 ( $wp_rewrite->using_permalinks() && $parent ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $parent->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $parent->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parentlink = get_permalink( $post->post_parent );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -682,7 +682,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' != get_option( 'permalink_structure' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == get_option( 'show_on_front' ) && $post_id == get_option( 'page_on_front' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = _get_page_link( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,13 +690,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $unattached ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = home_url( '/feed/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $feed !== get_default_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_default_feed() !== $feed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url .= "$feed/";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'attachment_id', $post_id, $url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( $url ) . 'feed';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $feed != get_default_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_default_feed() != $feed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url .= "/$feed";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $url = user_trailingslashit( $url, 'single_feed' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -710,7 +710,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> home_url( '/' )
</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 ( 'page' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'page' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'feed' => $feed,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +798,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( "?feed=$feed&author=" . $author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_author_posts_url( $author_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $feed == get_default_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_default_feed() == $feed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed_link = 'feed';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $feed_link = "feed/$feed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -877,7 +877,7 @@
</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"> $link = get_term_link( $term_id, $term->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $feed == get_default_feed() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_default_feed() == $feed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed_link = 'feed';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $feed_link = "feed/$feed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1222,7 +1222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $show_on_front = get_option( 'show_on_front' );
</span><span class="cx" style="display: block; padding: 0 10px"> $page_for_posts = get_option( 'page_for_posts' );
</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 ( 'page' == $show_on_front && $page_for_posts ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $show_on_front && $page_for_posts ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = get_permalink( $page_for_posts );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_home_url();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3634,9 +3634,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $scheme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = is_ssl() ? 'https' : 'http';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'admin' === $scheme || 'login' === $scheme || 'login_post' === $scheme || 'rpc' === $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'http' !== $scheme && 'https' !== $scheme && 'relative' !== $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $scheme = is_ssl() ? 'https' : 'http';
</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">@@ -3647,7 +3647,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'relative' == $scheme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $url !== '' && $url[0] === '/' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $url && '/' === $url[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = '/' . ltrim( $url, "/ \t\n\r\0\x0B" );
</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">@@ -3779,7 +3779,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $canonical_url = get_permalink( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a canonical is being generated for the current page, make sure it has pagination if needed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post->ID === get_queried_object_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_queried_object_id() === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = get_query_var( 'page', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page >= 2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == get_option( 'permalink_structure' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3887,7 +3887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type_object( $post->post_type );
</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 ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post->post_type && get_option( 'page_on_front' ) == $post->ID && 'page' === get_option( 'show_on_front' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $shortlink = home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $post_type->public ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $shortlink = home_url( '?p=' . $post_id );
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/media.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +70,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $size ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = $size[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = $size[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $size === 'thumb' || $size === 'thumbnail' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'thumb' === $size || 'thumbnail' === $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_width = intval( get_option( 'thumbnail_size_w' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = intval( get_option( 'thumbnail_size_h' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Last chance thumbnail size defaults.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,11 +78,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = 128;
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = 96;
</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 ( $size === 'medium' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'medium' === $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_width = intval( get_option( 'medium_size_w' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = intval( get_option( 'medium_size_h' ) );
</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 ( $size === 'medium_large' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'medium_large' === $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_width = intval( get_option( 'medium_large_size_w' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = intval( get_option( 'medium_large_size_h' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( intval( $content_width ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = min( intval( $content_width ), $max_width );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $size === 'large' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'large' === $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We're inserting a large size image into the editor. If it's a really
</span><span class="cx" style="display: block; padding: 0 10px"> * big image we'll scale it down to fit reasonably within the editor
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -238,7 +238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $width = $intermediate['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $height = $intermediate['height'];
</span><span class="cx" style="display: block; padding: 0 10px"> $is_intermediate = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $size === 'thumbnail' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'thumbnail' === $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Fall back to the old thumbnail.
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_file = wp_get_attachment_thumb_file( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> $info = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1116,7 +1116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|bool The image meta data as returned by `wp_get_attachment_metadata()`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $size_name === 'full' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'full' === $size_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> absint( $image_meta['width'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> absint( $image_meta['height'] ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1554,7 +1554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $image_filename = wp_basename( $image_src );
</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 ( $image_filename === wp_basename( $image_meta['file'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_basename( $image_meta['file'] ) === $image_filename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $width = (int) $image_meta['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $height = (int) $image_meta['height'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2054,12 +2054,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "</{$itemtag}>";
</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 ( ! $html5 && $columns > 0 && ++$i % $columns === 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $html5 && $columns > 0 && 0 === ++$i % $columns ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '<br style="clear: both" />';
</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 ( ! $html5 && $columns > 0 && $i % $columns !== 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $html5 && $columns > 0 && 0 !== $i % $columns ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "
</span><span class="cx" style="display: block; padding: 0 10px"> <br style='clear: both' />";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2226,7 +2226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = intval( $atts['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 ( $atts['type'] !== 'audio' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'audio' !== $atts['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $atts['type'] = 'video';
</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="trunksrcwpincludesmsfilesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-files.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-files.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/ms-files.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> error_reporting( 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 ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( '1' == $current_blog->archived || '1' == $current_blog->spam || '1' == $current_blog->deleted ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> status_header( 404 );
</span><span class="cx" style="display: block; padding: 0 10px"> die( '404 — File not found.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/ms-functions.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,16 +71,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! is_object( $primary ) ) || ( 1 == $primary->archived || 1 == $primary->spam || 1 == $primary->deleted ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blogs = get_blogs_of_user( $user_id, true ); // If a user's primary blog is shut down, check their other blogs.
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $blogs as $blog_id => $blog ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog->site_id != get_current_network_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_current_network_id() != $blog->site_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"> $details = get_site( $blog_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $details ) && 0 == $details->archived && 0 == $details->spam && 0 == $details->deleted ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ret = $details;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_user_meta( $user_id, 'primary_blog', true ) != $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_meta( $user_id, 'primary_blog', $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = strtolower( $path );
</span><span class="cx" style="display: block; padding: 0 10px"> $id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
</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 == -1 ) { // Blog does not exist.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 == $id ) { // Blog does not exist.
</ins><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return (int) $id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -419,7 +419,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"> $dotted_domain = ".$banned_domain";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( substr( $normalized_email, -strlen( $dotted_domain ) ) === $dotted_domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_email_address_unsafe = true;
</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">@@ -539,7 +539,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Has someone already signed up for this username?
</span><span class="cx" style="display: block; padding: 0 10px"> $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $signup != null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null != $signup ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $registered_at = mysql2date( 'U', $signup->registered );
</span><span class="cx" style="display: block; padding: 0 10px"> $now = time();
</span><span class="cx" style="display: block; padding: 0 10px"> $diff = $now - $registered_at;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,7 +552,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"> $signup = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $signup != null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null != $signup ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $diff = time() - mysql2date( 'U', $signup->registered );
</span><span class="cx" style="display: block; padding: 0 10px"> // If registered more than two days ago, cancel registration and let this signup go through.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $diff > 2 * DAY_IN_SECONDS ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -632,7 +632,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = new WP_Error();
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = get_site_option( 'illegal_names' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $illegal_names == false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false == $illegal_names ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( 'illegal_names', $illegal_names );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,7 +945,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $activate_url = esc_url( $activate_url );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = get_site_option( 'admin_email' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $admin_email == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $admin_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,7 +1070,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send email with activation link.
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = get_site_option( 'admin_email' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $admin_email == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $admin_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1589,7 +1589,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $switched_locale = switch_to_locale( get_user_locale( $user ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = get_site_option( 'welcome_email' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $welcome_email == false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false == $welcome_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = __(
</span><span class="cx" style="display: block; padding: 0 10px"> 'Howdy USERNAME,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1634,7 +1634,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = get_site_option( 'admin_email' );
</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 ( $admin_email == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $admin_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</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">@@ -1726,7 +1726,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = get_site_option( 'admin_email' );
</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 ( $admin_email == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $admin_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
</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">@@ -1849,7 +1849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_mimes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $site_exts as $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mimes as $ext_pattern => $mime ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $ext && false !== strpos( $ext_pattern, $ext ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_mimes[ $ext_pattern ] = $mime;
</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">@@ -1936,7 +1936,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent a race condition.
</span><span class="cx" style="display: block; padding: 0 10px"> $recurse_start = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $global_terms_recurse === null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $global_terms_recurse ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $recurse_start = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $global_terms_recurse = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 10 < $global_terms_recurse++ ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1947,7 +1947,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $global_id == null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null == $global_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null == $used_global_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->insert(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2093,7 +2093,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $destination ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $destination == '%siteurl%' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '%siteurl%' === $destination ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $destination = network_home_url();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $destination );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2119,7 +2119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = explode( '/', $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = array_pop( $parts );
</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 ( $key == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $key = array_pop( $parts );
</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">@@ -2261,7 +2261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function users_can_register_signup_filter() {
</span><span class="cx" style="display: block; padding: 0 10px"> $registration = get_site_option( 'registration' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( $registration == 'all' || $registration == 'user' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( 'all' === $registration || 'user' === $registration );
</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">@@ -2659,7 +2659,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $value The proposed new network admin email address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function update_network_option_new_admin_email( $old_value, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $value == get_site_option( 'admin_email' ) || ! is_email( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_site_option( 'admin_email' ) === $value || ! is_email( $value ) ) {
</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></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/ms-load.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blog->archived == '1' || $blog->spam == '1' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '1' == $blog->archived || '1' == $blog->spam ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return WP_CONTENT_DIR . '/blog-suspended.php';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenutemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/nav-menu-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,7 +28,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $container Whether to wrap the ul, and what to wrap it with. Default 'div'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $container_class Class that is applied to the container. Default 'menu-{menu slug}-container'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $container_id The ID that is applied to the container. Default empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type callable|bool $fallback_cb If the menu doesn't exists, a callback function will fire.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type callable|bool $fallback_cb If the menu doesn't exist, a callback function will fire.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Default is 'wp_page_menu'. Set to false for no fallback.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $before Text before the link markup. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $after Text after the link markup. Default empty.
</span></span></pre></div>
<a id="trunksrcwpincludesoptionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/option.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/option.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/option.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2227,7 +2227,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"> $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pos !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $new_whitelist_options[ $option_group ][ $pos ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $deprecated ) {
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/pluggable.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Mainly for legacy -- process a "From:" header if it's there.
</span><span class="cx" style="display: block; padding: 0 10px"> case 'from':
</span><span class="cx" style="display: block; padding: 0 10px"> $bracket_pos = strpos( $content, '<' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $bracket_pos !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $bracket_pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Text before the bracketed email is the "From" name.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $bracket_pos > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $from_name = substr( $content, 0, $bracket_pos - 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,7 +538,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $user = apply_filters( 'authenticate', null, $username, $password );
</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 == null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null == $user ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // TODO: What should the error message be? (Or would these even happen?)
</span><span class="cx" style="display: block; padding: 0 10px"> // Only needed if all authentication handlers fail to return anything.
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_Error( 'authentication_failed', __( '<strong>Error</strong>: Invalid username, email address or incorrect password.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1465,7 +1465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
</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( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts ) && $lp['host'] != strtolower( $wpp['host'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = $default;
</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">@@ -1544,7 +1544,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"> // The author moderated a comment on their own post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $author && ! $notify_author && get_current_user_id() == $post->post_author ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $emails[ $author->user_email ] );
</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">@@ -1957,7 +1957,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * string (admin only), 'user', or 'both' (admin and user). Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $deprecated !== null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null !== $deprecated ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '4.3.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">@@ -2527,7 +2527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = abs( hexdec( $value ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reduce the value to be within the min - max range.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $max != 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $max ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
</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="trunksrcwpincludespomomophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/mo.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/mo.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/pomo/mo.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,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"> // Support revision 0 of MO format specs, only.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $header['revision'] != 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 != $header['revision'] ) {
</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="trunksrcwpincludespomopluralformsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/plural-forms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/plural-forms.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/pomo/plural-forms.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,7 +125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found = false;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ! empty( $stack ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $o2 = $stack[ count( $stack ) - 1 ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $o2 !== '(' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '(' !== $o2 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output[] = array( 'op', array_pop( $stack ) );
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -162,7 +162,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $o2 = $stack[ count( $stack ) - 1 ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ternary is right-associative in C.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $operator === '?:' || $operator === '?' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '?:' === $operator || '?' === $operator ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( self::$op_precedence[ $operator ] >= self::$op_precedence[ $o2 ] ) {
</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">@@ -183,7 +183,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $s_pos = count( $stack ) - 1;
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $s_pos >= 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $o2 = $stack[ $s_pos ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $o2 !== '?' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '?' !== $o2 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output[] = array( 'op', array_pop( $stack ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $s_pos--;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ! empty( $stack ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $o2 = array_pop( $stack );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $o2 === '(' || $o2 === ')' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '(' === $o2 || ')' === $o2 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( 'Mismatched parentheses' );
</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">@@ -259,10 +259,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $i < $total ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $next = $this->tokens[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $next[0] === 'var' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'var' === $next[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack[] = $n;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $next[0] === 'value' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'value' === $next[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack[] = $next[1];
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludespomopophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/po.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/pomo/po.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $po = $quote . implode( "${slash}n$quote$newline$quote", explode( $newline, $string ) ) . $quote;
</span><span class="cx" style="display: block; padding: 0 10px"> // Add empty string on first line for readbility.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $string, $newline ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( substr_count( $string, $newline ) > 1 || ! ( $newline === substr( $string, -strlen( $newline ) ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( substr_count( $string, $newline ) > 1 || substr( $string, -strlen( $newline ) ) !== $newline ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = "$quote$quote$newline$po";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove empty strings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -294,7 +294,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $res ) {
</span><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 ( $res['entry']->singular == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $res['entry']->singular ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->set_headers( $this->make_headers( $res['entry']->translations[0] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_entry( $res['entry'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,7 +317,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function is_final( $context ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( $context === 'msgstr' ) || ( $context === 'msgstr_plural' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( 'msgstr' === $context ) || ( 'msgstr_plural' === $context );
</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">@@ -347,7 +347,7 @@
</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 ( $line == "\n" ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( "\n" === $line ) {
</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"> $line = trim( $line );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -359,7 +359,7 @@
</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"> // Comments have to be at the beginning.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context && $context != 'comment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $context && 'comment' !== $context ) {
</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"> // Add comment.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,7 +370,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno--;
</span><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 ( $context && $context != 'comment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $context && 'comment' !== $context ) {
</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"> $context = 'msgctxt';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,13 +381,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lineno--;
</span><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 ( $context && $context != 'msgctxt' && $context != 'comment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $context && 'msgctxt' !== $context && 'comment' !== $context ) {
</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"> $context = 'msgid';
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->singular .= PO::unpoify( $m[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/^msgid_plural\s+(".*")/', $line, $m ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context != 'msgid' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'msgid' !== $context ) {
</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"> $context = 'msgid_plural';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -394,13 +394,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->is_plural = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->plural .= PO::unpoify( $m[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/^msgstr\s+(".*")/', $line, $m ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context != 'msgid' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'msgid' !== $context ) {
</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"> $context = 'msgstr';
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->translations = array( PO::unpoify( $m[1] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/^msgstr\[(\d+)\]\s+(".*")/', $line, $m ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $context != 'msgid_plural' && $context != 'msgstr_plural' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'msgid_plural' !== $context && 'msgstr_plural' !== $context ) {
</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"> $context = 'msgstr_plural';
</span></span></pre></div>
<a id="trunksrcwpincludesposttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-template.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/post-template.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -338,7 +338,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = array( $content );
</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 !== strpos( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || $elements['page'] == 1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== strpos( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || 1 == $elements['page'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $strip_teaser = 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">@@ -1654,7 +1654,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function prepend_attachment( $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_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 ( empty( $post->post_type ) || $post->post_type != 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $post->post_type ) || 'attachment' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/post.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -676,15 +676,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $kids[ $child->ID ] = $children[ $key ];
</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 ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $kids;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $weeuns = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $kids as $kid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $weeuns[ $kid->ID ] = get_object_vars( $kids[ $kid->ID ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $weeuns;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $babes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $kids as $kid ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $babes[ $kid->ID ] = array_values( get_object_vars( $kids[ $kid->ID ] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,9 +784,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = $_post->filter( $filter );
</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 ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_post->to_array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_values( $_post->to_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">@@ -1806,7 +1806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype_obj = get_post_type_object( $ptype );
</span><span class="cx" style="display: block; padding: 0 10px"> // Sub-menus only.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $ptype_obj->show_in_menu || true === $ptype_obj->show_in_menu ) {
</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"> add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4213,7 +4213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $postarr['post_date_gmt'] = '';
</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 ( $postarr['post_type'] == 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $postarr['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_insert_attachment( $postarr, false, 0, $wp_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">@@ -4959,7 +4959,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Loop through the given path parts from right to left,
</span><span class="cx" style="display: block; padding: 0 10px"> * ensuring each matches the post ancestry.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( 0 != $p->post_parent && isset( $pages[ $p->post_parent ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $count++;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = $pages[ $p->post_parent ];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4968,7 +4968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $p = $parent;
</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 ( $p->post_parent == 0 && $count + 1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == $p->post_parent && count( $revparts ) == $count + 1 && $p->post_name == $revparts[ $count ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $foundid = $page->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page->post_type == $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6747,7 +6747,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _transition_post_status( $new_status, $old_status, $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( $old_status != 'publish' && $new_status == 'publish' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' !== $old_status && 'publish' === $new_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Reset GUID if transitioning to publish and it is empty.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' == get_the_guid( $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/rest-api.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_ssl() && isset( $_SERVER['SERVER_NAME'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the current host is the same as the REST URL host, force the REST URL scheme to HTTPS.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $_SERVER['SERVER_NAME'] === parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( parse_url( get_home_url( $blog_id ), PHP_URL_HOST ) === $_SERVER['SERVER_NAME'] ) {
</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="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/revision.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,12 +354,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</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 ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $revision;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_revision = get_object_vars( $revision );
</span><span class="cx" style="display: block; padding: 0 10px"> return $_revision;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_revision = array_values( get_object_vars( $revision ) );
</span><span class="cx" style="display: block; padding: 0 10px"> return $_revision;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/rewrite.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,7 +158,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function add_rewrite_tag( $tag, $regex, $query = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the tag's name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strlen( $tag ) < 3 || $tag[0] != '%' || $tag[ strlen( $tag ) - 1 ] != '%' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $tag ) < 3 || '%' !== $tag[0] || '%' !== $tag[ strlen( $tag ) - 1 ] ) {
</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></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/script-loader.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_scripts_get_suffix( $type = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $suffixes;
</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 ( $suffixes === null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $suffixes ) {
</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"> require ABSPATH . WPINC . '/version.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -614,7 +614,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $type === 'dev' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dev' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $suffixes['dev_suffix'];
</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="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/shortcodes.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -306,7 +306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow [[foo]] syntax for escaping a tag.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $m[1] == '[' && $m[6] == ']' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '[' === $m[1] && ']' === $m[6] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return substr( $m[0], 1, -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">@@ -663,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function strip_shortcode_tag( $m ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow [[foo]] syntax for escaping a tag.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $m[1] == '[' && $m[6] == ']' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '[' === $m[1] && ']' === $m[6] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return substr( $m[0], 1, -1 );
</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="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/taxonomy.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_taxonomies;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $object ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $object->post_type === 'attachment' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $object->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_attachment_taxonomies( $object, $output );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $object = $object->post_type;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,9 +880,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanitize term, according to the specified filter.
</span><span class="cx" style="display: block; padding: 0 10px"> $_term->filter( $filter );
</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 ( $output === ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ARRAY_A === $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_term->to_array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output === ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N === $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_values( $_term->to_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">@@ -2011,7 +2011,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( count( $taxonomies ) > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $index => $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = get_taxonomy( $taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $t->args ) && is_array( $t->args ) && $args != array_merge( $args, $t->args ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $t->args ) && is_array( $t->args ) && array_merge( $args, $t->args ) != $args ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $taxonomies[ $index ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = array_merge( $terms, wp_get_object_terms( $object_ids, $taxonomy, array_merge( $args, $t->args ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3150,7 +3150,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $object_types == array_filter( $object_types, 'post_type_exists' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( array_filter( $object_types, 'post_type_exists' ) == $object_types ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only post types are attached to this taxonomy.
</span><span class="cx" style="display: block; padding: 0 10px"> _update_post_term_count( $terms, $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4035,7 +4035,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'default_category', 'default_link_category', 'default_email_category' ) as $option ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $term_id === (int) get_option( $option, -1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_option( $option, -1 ) === $term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( $option, $new_term_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="trunksrcwpincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/theme.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +500,7 @@
</span><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"> foreach ( $dirs as $dir ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_dir( $theme_root . '/' . $dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_dir( $theme_root . '/' . $dir ) || '.' === $dir[0] || 'CVS' === $dir ) {
</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 ( file_exists( $theme_root . '/' . $dir . '/style.css' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,7 @@
</span><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"> foreach ( $sub_dirs as $sub_dir ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || $dir[0] == '.' || $dir == 'CVS' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_dir( $theme_root . '/' . $dir . '/' . $sub_dir ) || '.' === $dir[0] || 'CVS' === $dir ) {
</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 ( ! file_exists( $theme_root . '/' . $dir . '/' . $sub_dir . '/style.css' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,7 +553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_roots[ $theme_dir ] = $relative_theme_roots[ $theme_data['theme_root'] ]; // Convert absolute to relative.
</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 ( $theme_roots != get_site_transient( 'theme_roots' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_site_transient( 'theme_roots' ) != $theme_roots ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_site_transient( 'theme_roots', $theme_roots, $cache_expiration );
</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">@@ -1648,7 +1648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // A default has to be specified in style.css. It will not be printed here.
</span><span class="cx" style="display: block; padding: 0 10px"> $color = get_background_color();
</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 ( $color === get_theme_support( 'custom-background', 'default-color' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_theme_support( 'custom-background', 'default-color' ) === $color ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $color = 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="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/user.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base_capabilities_key = $wpdb->base_prefix . 'capabilities';
</span><span class="cx" style="display: block; padding: 0 10px"> $site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
</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( $keys[ $base_capabilities_key ] ) && $blog_id == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $keys[ $base_capabilities_key ] ) && 1 == $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 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">@@ -902,7 +902,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'time' == $strategy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_multisite() && $site_id != get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() != $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $avail_roles = wp_roles()->get_names();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1872,7 +1872,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'profile_update', $user_id, $old_user_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $userdata['spam'] ) && $userdata['spam'] != $old_user_data->spam ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $userdata['spam'] == 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == $userdata['spam'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires after the user is marked as a SPAM user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2493,7 +2493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user_email = apply_filters( 'user_registration_email', $user_email );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check the username.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $sanitized_user_login == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $sanitized_user_login ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'empty_username', __( '<strong>Error</strong>: Please enter a username.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! validate_username( $user_login ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'invalid_username', __( '<strong>Error</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2510,7 +2510,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"> // Check the email address.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user_email == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' == $user_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'empty_email', __( '<strong>Error</strong>: Please type your email address.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $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.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2677,7 +2677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefix = $wpdb->get_blog_prefix( $site_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 ( is_multisite() && $site_id != get_current_blog_id() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && get_current_blog_id() != $site_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch_to_blog( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $role_names = wp_roles()->get_names();
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-includes/wp-db.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1735,7 +1735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // First peel off the socket parameter from the right, if it exists.
</span><span class="cx" style="display: block; padding: 0 10px"> $socket_pos = strpos( $host, ':/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $socket_pos !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $socket_pos ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $socket = substr( $host, $socket_pos + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $host = substr( $host, 0, $socket_pos );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2536,7 +2536,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 there is a value return it else return null.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( isset( $values[ $x ] ) && $values[ $x ] !== '' ) ? $values[ $x ] : null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( isset( $values[ $x ] ) && '' !== $values[ $x ] ) ? $values[ $x ] : null;
</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">@@ -2569,13 +2569,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return null;
</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 ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->last_result[ $y ] ? get_object_vars( $this->last_result[ $y ] ) : null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->last_result[ $y ] ? array_values( get_object_vars( $this->last_result[ $y ] ) ) : null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strtoupper( $output ) === OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( OBJECT === strtoupper( $output ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back compat for OBJECT being previously case-insensitive.
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->last_result[ $y ] ? $this->last_result[ $y ] : null;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2644,10 +2644,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"> $new_array = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $output == OBJECT ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( OBJECT == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return an integer-keyed array of row objects.
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->last_result;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == OBJECT_K ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( OBJECT_K == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return an array of row objects with keys from column 1.
</span><span class="cx" style="display: block; padding: 0 10px"> // (Duplicates are discarded.)
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->last_result ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2660,11 +2660,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"> return $new_array;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ARRAY_A == $output || ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Return an integer-keyed array of...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->last_result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $this->last_result as $row ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $output == ARRAY_N ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ARRAY_N == $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // ...integer-keyed row arrays.
</span><span class="cx" style="display: block; padding: 0 10px"> $new_array[] = array_values( get_object_vars( $row ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3373,7 +3373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->load_col_info();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->col_info ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $col_offset == -1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( -1 == $col_offset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $new_array = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $this->col_info as $col ) {
</span></span></pre></div>
<a id="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2020-02-09 16:51:22 UTC (rev 47218)
+++ trunk/src/wp-login.php 2020-02-09 16:52:28 UTC (rev 47219)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -514,7 +514,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = dirname( set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] ) );
</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 ( $url !== get_option( 'siteurl' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'siteurl' ) !== $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'siteurl', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,7 +1282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( empty( $redirect_to ) || $redirect_to === 'wp-admin/' || $redirect_to === admin_url() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( empty( $redirect_to ) || 'wp-admin/' === $redirect_to || admin_url() === $redirect_to ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the user doesn't belong to a blog, send them to user admin. If the user can't edit posts, send them to their profile.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! get_active_blog_for_user( $user->ID ) && ! is_super_admin( $user->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = user_admin_url();
</span></span></pre>
</div>
</div>
</body>
</html>