<!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>[47808] trunk/src: Coding Standards: Use strict comparison where static strings are involved.</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/47808">47808</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/47808","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-05-16 18:40:52 +0000 (Sat, 16 May 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 strict comparison where static strings are involved.
This reduces the number of `WordPress.PHP.StrictComparisons.LooseComparison` issues in half, from 1897 to 890.
Includes minor code layout fixes for better readability.
See <a href="https://core.trac.wordpress.org/ticket/49542">#49542</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.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="#trunksrcwpadminincludesbookmarkphp">trunk/src/wp-admin/includes/bookmark.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="#trunksrcwpadminincludesclasslanguagepackupgraderphp">trunk/src/wp-admin/includes/class-language-pack-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclassplugininstallerskinphp">trunk/src/wp-admin/includes/class-plugin-installer-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenueditphp">trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpfilesystembasephp">trunk/src/wp-admin/includes/class-wp-filesystem-base.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppluginslisttablephp">trunk/src/wp-admin/includes/class-wp-plugins-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="#trunksrcwpadminincludesclasswpsitehealthautoupdatesphp">trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludescommentphp">trunk/src/wp-admin/includes/comment.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmenuphp">trunk/src/wp-admin/includes/menu.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesoptionsphp">trunk/src/wp-admin/includes/options.php</a></li>
<li><a href="#trunksrcwpadminincludesplugininstallphp">trunk/src/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesscreenphp">trunk/src/wp-admin/includes/screen.php</a></li>
<li><a href="#trunksrcwpadminincludestaxonomyphp">trunk/src/wp-admin/includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadminmaintrepairphp">trunk/src/wp-admin/maint/repair.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworkphp">trunk/src/wp-admin/network.php</a></li>
<li><a href="#trunksrcwpadminoptionsdiscussionphp">trunk/src/wp-admin/options-discussion.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminplugineditorphp">trunk/src/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunksrcwpadminplugininstallphp">trunk/src/wp-admin/plugin-install.php</a></li>
<li><a href="#trunksrcwpadminpluginsphp">trunk/src/wp-admin/plugins.php</a></li>
<li><a href="#trunksrcwpadminpostnewphp">trunk/src/wp-admin/post-new.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminsetupconfigphp">trunk/src/wp-admin/setup-config.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.php</a></li>
<li><a href="#trunksrcwpadminthemesphp">trunk/src/wp-admin/themes.php</a></li>
<li><a href="#trunksrcwpadminupdatecorephp">trunk/src/wp-admin/update-core.php</a></li>
<li><a href="#trunksrcwpadminupdatephp">trunk/src/wp-admin/update.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentfeaturedphp">trunk/src/wp-content/themes/twentyeleven/content-featured.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentsinglephp">trunk/src/wp-content/themes/twentyeleven/content-single.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevencontentphp">trunk/src/wp-content/themes/twentyeleven/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenfunctionsphp">trunk/src/wp-content/themes/twentyeleven/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenincwidgetsphp">trunk/src/wp-content/themes/twentyeleven/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenshowcasephp">trunk/src/wp-content/themes/twentyeleven/showcase.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevensidebarphp">trunk/src/wp-content/themes/twentyeleven/sidebar.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteencontentsearchphp">trunk/src/wp-content/themes/twentyfifteen/content-search.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteenfunctionsphp">trunk/src/wp-content/themes/twentyfifteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentphp">trunk/src/wp-content/themes/twentyfourteen/content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenfunctionsphp">trunk/src/wp-content/themes/twentyfourteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp">trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytenloopphp">trunk/src/wp-content/themes/twentyten/loop.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenfunctionsphp">trunk/src/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentythirteenjsthemecustomizerjs">trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs">trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js</a></li>
<li><a href="#trunksrcwpincludesadminbarphp">trunk/src/wp-includes/admin-bar.php</a></li>
<li><a href="#trunksrcwpincludesauthortemplatephp">trunk/src/wp-includes/author-template.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="#trunksrcwpincludesclasswalkercategoryphp">trunk/src/wp-includes/class-walker-category.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkercommentphp">trunk/src/wp-includes/class-walker-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswalkerpagephp">trunk/src/wp-includes/class-walker-page.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpeditorphp">trunk/src/wp-includes/class-wp-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswpembedphp">trunk/src/wp-includes/class-wp-embed.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcookiephp">trunk/src/wp-includes/class-wp-http-cookie.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpencodingphp">trunk/src/wp-includes/class-wp-http-encoding.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpstreamsphp">trunk/src/wp-includes/class-wp-http-streams.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorphp">trunk/src/wp-includes/class-wp-image-editor.php</a></li>
<li><a href="#trunksrcwpincludesclasswplistutilphp">trunk/src/wp-includes/class-wp-list-util.php</a></li>
<li><a href="#trunksrcwpincludesclasswplocalephp">trunk/src/wp-includes/class-wp-locale.php</a></li>
<li><a href="#trunksrcwpincludesclasswpmetaqueryphp">trunk/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnetworkqueryphp">trunk/src/wp-includes/class-wp-network-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedphp">trunk/src/wp-includes/class-wp-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpposttypephp">trunk/src/wp-includes/class-wp-post-type.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="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxonomyphp">trunk/src/wp-includes/class-wp-taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemephp">trunk/src/wp-includes/class-wp-theme.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.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="#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="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsdefaultconstantsphp">trunk/src/wp-includes/ms-default-constants.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.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="#trunksrcwpincludesmssettingsphp">trunk/src/wp-includes/ms-settings.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.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="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
<li><a href="#trunksrcwpincludespomostreamsphp">trunk/src/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunksrcwpincludespomotranslationsphp">trunk/src/wp-includes/pomo/translations.php</a></li>
<li><a href="#trunksrcwpincludespostformatsphp">trunk/src/wp-includes/post-formats.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="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatcommentsphp">trunk/src/wp-includes/theme-compat/comments.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>
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/admin-header.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'admin_head' );
</span><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_user_setting( 'mfold' ) === 'f' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'f' === get_user_setting( 'mfold' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' folded';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmineditformadvancedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-advanced.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-advanced.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/edit-form-advanced.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'editor-expand' );
</span><span class="cx" style="display: block; padding: 0 10px"> $_content_editor_dfw = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_wp_editor_expand = ( get_user_setting( 'editor_expand', 'on' ) === 'on' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_wp_editor_expand = ( 'on' === get_user_setting( 'editor_expand', 'on' ) );
</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 ( wp_is_mobile() ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> wp_die( -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 ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' == ini_get( 'output_handler' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'can_compress_scripts', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,10 +209,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo $out;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'no' == $_GET['test'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'no' === $_GET['test'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'update_can_compress_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'can_compress_scripts', 0 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'yes' == $_GET['test'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'yes' === $_GET['test'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'update_can_compress_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'can_compress_scripts', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -704,13 +704,13 @@
</span><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"> if ( isset( $_POST['trash'] ) && 1 == $_POST['trash'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_trash_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['untrash'] ) && 1 == $_POST['untrash'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,13 +721,13 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'spam' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = wp_spam_comment( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['unspam'] ) && 1 == $_POST['unspam'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'spam' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( time() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,7 +883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash-post' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash-post' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $done = wp_trash_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $done = wp_untrash_post( $id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1301,7 +1301,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you must be logged in to reply to a comment.' ) );
</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_content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $comment_content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error: Please type a comment.' ) );
</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">@@ -1344,11 +1344,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $position = ( isset( $_POST['position'] ) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['mode'] ) && 'dashboard' == $_REQUEST['mode'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['mode'] ) && 'dashboard' === $_REQUEST['mode'] ) {
</ins><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"> _wp_dashboard_recent_comments_row( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['mode'] ) && 'single' == $_REQUEST['mode'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['mode'] ) && 'single' === $_REQUEST['mode'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
</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', array( 'screen' => 'edit-comments' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1403,7 +1403,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $_POST['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $_POST['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error: Please type a comment.' ) );
</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">@@ -1461,7 +1461,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $menu_item_data['menu-item-type'] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'custom' != $menu_item_data['menu-item-type'] &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'custom' !== $menu_item_data['menu-item-type'] &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ! empty( $menu_item_data['menu-item-object-id'] )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $menu_item_data['menu-item-type'] ) {
</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"> wp_die( -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( $_POST['metakeyselect'] ) && '#NONE#' == $_POST['metakeyselect'] && empty( $_POST['metakeyinput'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['metakeyselect'] ) && '#NONE#' === $_POST['metakeyselect'] && empty( $_POST['metakeyinput'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1604,7 +1604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_unslash( $_POST['meta'][ $mid ]['key'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $value = wp_unslash( $_POST['meta'][ $mid ]['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 ( '' == trim( $key ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === trim( $key ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Please provide a custom field name.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1795,11 +1795,11 @@
</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/includes/nav-menu.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( $_POST['item-type'] ) && 'post_type' == $_POST['item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['item-type'] ) && 'post_type' === $_POST['item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'posttype';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = 'wp_nav_menu_item_post_type_meta_box';
</span><span class="cx" style="display: block; padding: 0 10px"> $items = (array) get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_POST['item-type'] ) && 'taxonomy' == $_POST['item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_POST['item-type'] ) && 'taxonomy' === $_POST['item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'taxonomy';
</span><span class="cx" style="display: block; padding: 0 10px"> $callback = 'wp_nav_menu_item_taxonomy_meta_box';
</span><span class="cx" style="display: block; padding: 0 10px"> $items = (array) get_taxonomies( array( 'show_ui' => true ), 'object' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1985,7 +1985,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = (int) $_POST['post_ID'];
</span><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'] ) {
</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"> if ( ! current_user_can( 'edit_page', $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2030,7 +2030,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"> // Status.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $data['keep_private'] ) && 'private' == $data['keep_private'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $data['keep_private'] ) && 'private' === $data['keep_private'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['visibility'] = 'private';
</span><span class="cx" style="display: block; padding: 0 10px"> $data['post_status'] = 'private';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2180,7 +2180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = trim( $post->post_title ) ? $post->post_title : __( '(no title)' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $alt = ( 'alternate' == $alt ) ? '' : 'alternate';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $alt = ( 'alternate' === $alt ) ? '' : 'alternate';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'publish':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2198,7 +2198,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 ( '0000-00-00 00:00:00' == $post->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 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Date format in table columns, see https://www.php.net/date */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2883,7 +2883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2996,7 +2996,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $changes = $_REQUEST['changes'];
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_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 ( 'attachment' != $post['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3087,7 +3087,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_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 ( 'attachment' != $post['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3154,7 +3154,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 ( 'attachment' != $attachment->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $attachment->post_type ) {
</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">@@ -3190,7 +3190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3304,7 +3304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ext_type = wp_ext2type( $ext );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'audio' == $ext_type || 'video' == $ext_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'audio' === $ext_type || 'video' === $ext_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $ext_type;
</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="trunksrcwpadminincludesbookmarkphp"></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/bookmark.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/bookmark.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/bookmark.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['link_name'] = esc_html( $_POST['link_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['link_image'] = esc_html( $_POST['link_image'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['link_rss'] = esc_url( $_POST['link_rss'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_POST['link_visible'] ) || 'N' != $_POST['link_visible'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['link_visible'] ) || 'N' !== $_POST['link_visible'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['link_visible'] = 'Y';
</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">@@ -174,8 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update = 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 ( trim( $link_name ) == '' ) {
- if ( trim( $link_url ) != '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === trim( $link_name ) ) {
+ if ( '' !== trim( $link_url ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_name = $link_url;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,7 +182,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 ( trim( $link_url ) == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === trim( $link_url ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 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">@@ -309,7 +309,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_link_manager_disabled_message() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $pagenow;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! in_array( $pagenow, array( 'link-manager.php', 'link-add.php', 'link.php' ), true ) ) {
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,7 +104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['do_rollback'] && $current->packages->rollback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $to_download = 'rollback';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $current->packages->partial && 'reinstall' != $current->response && $wp_version == $current->partial_version && $partial ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $current->packages->partial && 'reinstall' !== $current->response && $wp_version == $current->partial_version && $partial ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $to_download = 'partial';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $current->packages->new_bundled && version_compare( $wp_version, $current->new_bundled, '<' )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( ! defined( 'CORE_UPGRADE_SKIP_NEW_BUNDLED' ) || ! CORE_UPGRADE_SKIP_NEW_BUNDLED ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -402,7 +402,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $checksums as $file => $checksum ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Skip files which get updated.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wp-content' == substr( $file, 0, 10 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp-content' === substr( $file, 0, 10 ) ) {
</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( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> * or 'uploaded' (for the Uploaded Images control).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function show_header_selector( $type = 'default' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'default' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = $this->default_headers;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = get_uploaded_header_images();
</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"> if ( ! checked )
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> text_color = $('#text-color');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == text_color.val().replace('#', '') ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === text_color.val().replace('#', '') ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> text_color.val( default_color );
</span><span class="cx" style="display: block; padding: 0 10px"> pickColor( default_color );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasslanguagepackupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-language-pack-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-language-pack-upgrader.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,7 +188,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 ( 'upgrader_process_complete' == current_filter() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'upgrader_process_complete' === current_filter() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback( 'starting_upgrade' );
</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">@@ -232,9 +232,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->language_update = $language_update;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $destination = WP_LANG_DIR;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'plugin' == $language_update->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'plugin' === $language_update->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $destination .= '/plugins';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'theme' == $language_update->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'theme' === $language_update->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $destination .= '/themes';
</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">@@ -335,9 +335,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $po = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $mo = false;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $files as $file => $filedata ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.po' == substr( $file, -3 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.po' === substr( $file, -3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $po = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '.mo' == substr( $file, -3 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '.mo' === substr( $file, -3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mo = 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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-plugin-installer-skin.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,13 +60,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $from = isset( $_GET['from'] ) ? wp_unslash( $_GET['from'] ) : 'plugins';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '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['activate_plugin'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="button button-primary" href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Activate Plugin & Run Importer' )
</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 ( 'press-this' == $from ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'press-this' === $from ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $install_actions['activate_plugin'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="button button-primary" href="%s" target="_parent">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_url( 'plugins.php?action=activate&from=press-this&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenuchecklistphp"></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-nav-menu-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-nav-menu-checklist.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> global $_nav_menu_placeholder, $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' == $item->post_type ? $item->object_id : $_nav_menu_placeholder;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' === $item->post_type ? $item->object_id : $_nav_menu_placeholder;
</ins><span class="cx" style="display: block; padding: 0 10px"> $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkernavmenueditphp"></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-nav-menu-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-edit.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,17 +72,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = 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 ( 'taxonomy' == $item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'taxonomy' === $item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_term( (int) $item->object_id, $item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object && ! is_wp_error( $original_title ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_type' == $item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type' === $item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post( $item->object_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_the_title( $original_object->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">- } elseif ( 'post_type_archive' == $item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' === $item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post_type_object( $item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->labels->archives;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,13 +101,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'menu-item-invalid';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Title of an invalid menu item. */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%s (Invalid)' ), $item->title );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $item->post_status ) && 'draft' === $item->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'pending';
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Title of a menu item in draft status. */
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( __( '%s (Pending)' ), $item->title );
</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">- $title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ( ! isset( $item->label ) || '' === $item->label ) ? $title : $item->label;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_text = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $depth ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="menu-item-settings wp-clearfix" id="menu-item-settings-<?php echo $item_id; ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'custom' == $item->type ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'custom' === $item->type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="field-url description description-wide">
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="edit-menu-item-url-<?php echo $item_id; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'URL' ); ?><br />
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,13 +143,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only relax the filesystem checks when the update doesn't include new files.
</span><span class="cx" style="display: block; padding: 0 10px"> $allow_relaxed_file_ownership = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allow_relaxed_file_ownership = 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"> // If we can't do an auto core update, we may still be able to email the user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $skin->request_filesystem_credentials( false, $context, $allow_relaxed_file_ownership ) || $this->is_vcs_checkout( $context ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->send_core_update_notification_email( $item );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Next up, is this an item we can update?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $update = Core_Upgrader::should_update_to_version( $item->current );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $update = ! empty( $item->autoupdate );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $update = apply_filters( "auto_update_{$type}", $update, $item );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->send_core_update_notification_email( $item );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,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 it's a core update, are we actually compatible with its requirements?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $php_compat = version_compare( phpversion(), $item->php_version, '>=' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,7 +344,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"> $allow_relaxed_file_ownership = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'core' == $type && isset( $item->new_files ) && ! $item->new_files ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type && isset( $item->new_files ) && ! $item->new_files ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allow_relaxed_file_ownership = 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">@@ -367,9 +367,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
</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 ( 'core' == $type ) {
- if ( is_wp_error( $upgrade_result ) && ( 'up_to_date' == $upgrade_result->get_error_code() || 'locked' == $upgrade_result->get_error_code() ) ) {
- // These aren't actual errors, treat it as a skipped-update instead to avoid triggering the post-core update failure routines.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'core' === $type ) {
+ if ( is_wp_error( $upgrade_result )
+ && ( 'up_to_date' === $upgrade_result->get_error_code()
+ || 'locked' === $upgrade_result->get_error_code() )
+ ) {
+ // These aren't actual errors, treat it as a skipped-update instead
+ // to avoid triggering the post-core update failure routines.
</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">@@ -626,12 +630,14 @@
</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"> $next_user_core_update = get_preferred_from_update_core();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the update transient is empty, use the update we just performed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $next_user_core_update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $next_user_core_update = $core_update;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $newer_version_available = ( 'upgrade' === $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update->version, '>' ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to send an email following an automatic background core update.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -715,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't show this message if there is a newer version available.
</span><span class="cx" style="display: block; padding: 0 10px"> // Potential for confusion, and also not useful for them to know at this point.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'fail' == $type && ! $newer_version_available ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'fail' === $type && ! $newer_version_available ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= __( 'We tried but were unable to update your site automatically.' ) . ' ';
</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">@@ -778,7 +784,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . __( 'The WordPress Team' ) . "\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'critical' == $type && is_wp_error( $result ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'critical' === $type && is_wp_error( $result ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n***\n\n";
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: WordPress version. */
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= sprintf( __( 'Your site was running version %s.' ), get_bloginfo( 'version' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -787,7 +793,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we had a rollback and we're still critical, then the rollback failed too.
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through all errors (the main WP_Error, the update result, the rollback result) for code, data, etc.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rollback_was_required' == $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'rollback_was_required' === $result->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors = array( $result, $result->get_error_data()->update, $result->get_error_data()->rollback );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors = array( $result );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,20 +803,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $error ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $error_code = $error->get_error_code();
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Error code. */
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n\n" . sprintf( __( 'Error code: %s' ), $error_code );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rollback_was_required' == $error_code ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'rollback_was_required' === $error_code ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $error->get_error_message() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . $error->get_error_message();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $error_data = $error->get_error_data();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $error_data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n" . implode( ', ', (array) $error_data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $body .= "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommentslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-comments-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,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"> $link = admin_url( 'edit-comments.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $comment_type ) && 'all' != $comment_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $comment_type ) && 'all' !== $comment_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = add_query_arg( 'comment_type', $comment_type, $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">@@ -634,7 +634,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"> // Not looking at all comments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $comment_status && 'all' != $comment_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $comment_status && 'all' !== $comment_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'approved' === $the_comment_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" data-wp-lists="%s" class="vim-u vim-destructive aria-button-if-js" aria-label="%s">%s</a>',
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpfilesystembasephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-filesystem-base.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-base.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = get_theme_root( $theme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Account for relative theme roots.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/themes' == $theme_root || ! is_dir( $theme_root ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/themes' === $theme_root || ! is_dir( $theme_root ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_root = WP_CONTENT_DIR . $theme_root;
</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">@@ -208,7 +208,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">- } elseif ( 'direct' == $this->method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'direct' === $this->method ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $folder = str_replace( '\\', '/', $folder ); // Windows path sanitisation.
</span><span class="cx" style="display: block; padding: 0 10px"> return trailingslashit( $folder );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false The location of the remote path, false to cease looping.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function search_for_folder( $folder, $base = '.', $loop = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $base ) || '.' == $base ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $base ) || '.' === $base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $base = trailingslashit( $this->cwd() );
</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">@@ -305,7 +305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent this function from looping again.
</span><span class="cx" style="display: block; padding: 0 10px"> // No need to proceed if we've just searched in `/`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $loop || '/' == $base ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $loop || '/' === $base ) {
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-direct.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $file = str_replace( '\\', '/', $file ); // For Win32, occasional problems deleting files otherwise.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'f' == $type || $this->is_file( $file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $type || $this->is_file( $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return @unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursive && $this->is_dir( $file ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,11 +580,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $struc = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['name'] = $entry;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $include_hidden && '.' == $struc['name'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_hidden && '.' === $struc['name'][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">@@ -603,7 +603,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['time'] = gmdate( 'h:i:s', $struc['lastmodunix'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['type'] = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'd' == $struc['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'd' === $struc['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $recursive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpext.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,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"> $this->options['ssl'] = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $opt['connection_type'] ) && 'ftps' == $opt['connection_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $opt['connection_type'] ) && 'ftps' === $opt['connection_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->options['ssl'] = 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">@@ -373,7 +373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 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 ( 'f' == $type || $this->is_file( $file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $type || $this->is_file( $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return ftp_delete( $this->link, $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursive ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -695,11 +695,11 @@
</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 ( '.' == $entry['name'] || '..' == $entry['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $entry['name'] || '..' === $entry['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $include_hidden && '.' == $entry['name'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_hidden && '.' === $entry['name'][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">@@ -712,7 +712,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $dirlist as $struc ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'd' == $struc['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'd' === $struc['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $recursive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -383,7 +383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 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 ( 'f' == $type || $this->is_file( $file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $type || $this->is_file( $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->ftp->delete( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursive ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -615,11 +615,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $list as $struc ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $include_hidden && '.' == $struc['name'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_hidden && '.' === $struc['name'][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">@@ -627,7 +627,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 ( 'd' == $struc['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'd' === $struc['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $recursive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-filesystem-ssh2.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> 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 ( false === $data ) ? 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">@@ -499,7 +499,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 delete( $file, $recursive = false, $type = false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'f' == $type || $this->is_file( $file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $type || $this->is_file( $file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return ssh2_sftp_unlink( $this->sftp_link, $file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $recursive ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -725,11 +725,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $struc = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['name'] = $entry;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $struc['name'] || '..' === $struc['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue; // Do not care about these folders.
</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 ( ! $include_hidden && '.' == $struc['name'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $include_hidden && '.' === $struc['name'][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">@@ -748,7 +748,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['time'] = gmdate( 'h:i:s', $struc['lastmodunix'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['type'] = $this->is_dir( $path . '/' . $entry ) ? 'd' : 'f';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'd' == $struc['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'd' === $struc['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $recursive ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $struc['files'] = $this->dirlist( $path . '/' . $struc['name'], $include_hidden, $recursive );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,7 +352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'themes.php';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'search' != $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'search' !== $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status_links[ $type ] = 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"> esc_url( add_query_arg( 'theme_status', $type, $url ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,10 +374,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $status;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'enabled' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enabled' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['enable-selected'] = $this->is_site_themes ? __( 'Enable' ) : __( 'Network Enable' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'disabled' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'disabled' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['disable-selected'] = $this->is_site_themes ? __( 'Disable' ) : __( 'Network Disable' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->is_site_themes ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppluginslisttablephp"></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-plugins-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-plugins-list-table.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -517,11 +517,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actions = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'active' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'active' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['activate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Activate' ) : __( 'Activate' );
</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 ( 'inactive' != $status && 'recent' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'inactive' !== $status && 'recent' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['deactivate-selected'] = $this->screen->in_admin( 'network' ) ? __( 'Network Deactivate' ) : __( 'Deactivate' );
</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">@@ -530,7 +530,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['update-selected'] = __( 'Update' );
</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 ( current_user_can( 'delete_plugins' ) && ( 'active' != $status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( current_user_can( 'delete_plugins' ) && ( 'active' !== $status ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['delete-selected'] = __( 'Delete' );
</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">@@ -565,7 +565,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="alignleft actions">';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'recently_activated' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'recently_activated' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> submit_button( __( 'Clear List' ), '', 'clear-recent-list', false );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'top' === $which && 'mustuse' === $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -858,7 +858,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $plugin_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 ( 'dropins' != $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dropins' !== $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $description = '<p>' . ( $plugin_data['Description'] ? $plugin_data['Description'] : ' ' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_name = $plugin_data['Name'];
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1190,7 +1190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_links = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $t ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_in_term_qv = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_in_term_qv['post_type'] = $post->post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomy_object->query_var ) {
</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"> $actions = array();
</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 && 'trash' != $post->post_status ) {
</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"> $actions['edit'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" aria-label="%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">@@ -1395,7 +1395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Preview' )
</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">- } elseif ( 'trash' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' !== $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['view'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="%s" rel="bookmark" aria-label="%s">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> get_permalink( $post->ID ),
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthautoupdatesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Filesystem();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'direct' != $wp_filesystem->method ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'direct' !== $wp_filesystem->method ) {
</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">@@ -378,7 +378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $unwritable_files = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $checksums ) as $file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wp-content' == substr( $file, 0, 10 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp-content' === substr( $file, 0, 10 ) ) {
</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( ABSPATH . $file ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswptermslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-terms-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> );
</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' != $this->screen->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $this->screen->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['post_type'] = $this->screen->post_type;
</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="trunksrcwpadminincludesclasswpupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-upgrader.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete( $working_dir, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'incompatible_archive' == $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'incompatible_archive' === $result->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $result->get_error_data() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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"> foreach ( $files as $filename => $file_details ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Attempt to alter permissions to allow writes and try again.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_filesystem->chmod( $remote_destination . $filename, ( 'd' == $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_filesystem->chmod( $remote_destination . $filename, ( 'd' === $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $unwritable_files[] = $filename;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,7 +603,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"> $destination_name = basename( str_replace( $local_destination, '', $destination ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $destination_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $destination_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $destination_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">@@ -744,7 +744,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $download ) && $download->get_error_data( 'softfail-filename' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't output the 'no signature could be found' failure message for now.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'signature_verification_no_signature' != $download->get_error_code() || WP_DEBUG ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'signature_verification_no_signature' !== $download->get_error_code() || WP_DEBUG ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Output the failure error as a normal feedback, and not as an error.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->skin->feedback( $download->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludescommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/comment.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/comment.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function enqueue_comment_hotkeys_js() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'true' === get_user_option( 'comment_shortcuts' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'jquery-table-hotkeys' );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/dashboard.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[ $widget_id ]['callback'], $wp_registered_widget_controls[ $widget_id ]['callback'] );
</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' == $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'POST' === $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget_id'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start(); // Hack - but the same hack wp-admin/widgets.php uses.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'post', 'page' ) as $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $num_posts = wp_count_posts( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $num_posts && $num_posts->publish ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of posts. */
</span><span class="cx" style="display: block; padding: 0 10px"> $text = _n( '%s Post', '%s Posts', $num_posts->publish );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,10 +758,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $i = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $actions as $action => $link ) {
</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">- ( ( ( 'approve' == $action || 'unapprove' == $action ) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ( 'approve' === $action || 'unapprove' === $action ) && 2 === $i ) || 1 === $i ) {
+ $sep = '';
+ } else {
+ $sep = ' | ';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Reply and quickedit need a hide-if-no-js span.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'reply' == $action || 'quickedit' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'reply' === $action || 'quickedit' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action .= ' hide-if-no-js';
</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">@@ -768,6 +773,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'view' === $action && '1' !== $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action .= ' hidden';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions_string .= "<span class='$action'>$sep$link</span>";
</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">@@ -784,7 +790,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">- <?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! $comment->comment_type || 'comment' === $comment->comment_type ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="dashboard-comment-wrap has-row-actions <?php echo $comment_row_class; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="comment-meta">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,7 +1180,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_options[ $widget_id ]['number'] = $number;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget-rss'][ $number ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'POST' === $_SERVER['REQUEST_METHOD'] && isset( $_POST['widget-rss'][ $number ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['widget-rss'][ $number ] = wp_unslash( $_POST['widget-rss'][ $number ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_options[ $widget_id ] = wp_widget_rss_process( $_POST['widget-rss'][ $number ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_options[ $widget_id ]['number'] = $number;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1891,10 +1897,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="welcome-panel-column">
</span><span class="cx" style="display: block; padding: 0 10px"> <h3><?php _e( 'Next Steps' ); ?></h3>
</span><span class="cx" style="display: block; padding: 0 10px"> <ul>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'page' === get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( 'page' === get_option( 'show_on_front' ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/export.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Disposition: attachment; filename=' . $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ), 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 ( 'all' != $args['content'] && post_type_exists( $args['content'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $args['content'] && post_type_exists( $args['content'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptype = get_post_type_object( $args['content'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ptype->can_export ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['content'] = 'post';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where = $wpdb->prepare( "{$wpdb->posts}.post_type IN (" . implode( ',', $esses ) . ')', $post_types );
</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 ( $args['status'] && ( 'post' == $args['content'] || 'page' == $args['content'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['status'] && ( 'post' === $args['content'] || 'page' === $args['content'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_status = %s", $args['status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_status != 'auto-draft'";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $join = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['category'] && 'post' == $args['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['category'] && 'post' === $args['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = term_exists( $args['category'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $join = "INNER JOIN {$wpdb->term_relationships} ON ({$wpdb->posts}.ID = {$wpdb->term_relationships}.object_id)";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,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 ( 'post' == $args['content'] || 'page' == $args['content'] || 'attachment' == $args['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $args['content'], array( 'post', 'page', 'attachment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args['author'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.post_author = %d", $args['author'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $cat = get_term( $term['term_id'], 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $cats = array( $cat->term_id => $cat );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $term, $cat );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'all' == $args['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'all' === $args['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $categories = (array) get_categories( array( 'get' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = (array) get_tags( array( 'get' => 'all' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,7 +428,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"> function wxr_filter_postmeta( $return_me, $meta_key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '_edit_lock' == $meta_key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '_edit_lock' === $meta_key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return_me = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $return_me;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -513,7 +513,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </wp:term>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</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">- if ( 'all' == $args['content'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $args['content'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wxr_nav_menu_terms();}
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/file.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dir = get_temp_dir();
</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( $filename ) || '.' == $filename || '/' == $filename || '\\' == $filename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $filename ) || in_array( $filename, array( '.', '/', '\\' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = uniqid();
</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">@@ -1103,7 +1103,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $signature_url = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $url_path = parse_url( $url, PHP_URL_PATH );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $url_path, -4 ) == '.zip' || substr( $url_path, -7 ) == '.tar.gz' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '.zip' === substr( $url_path, -4 ) || '.tar.gz' === substr( $url_path, -7 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $signature_url = str_replace( $url_path, $url_path . '.sig', $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">@@ -1450,7 +1451,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $result ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $result;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_wp_error( $result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'incompatible_archive' != $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'incompatible_archive' !== $result->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $result;
</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">@@ -1562,7 +1563,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/' == substr( $info['name'], -1 ) ) { // Directory.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' === substr( $info['name'], -1 ) ) { // Directory.
</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">@@ -1732,7 +1733,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 ( 'f' == $fileinfo['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $fileinfo['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If copy failed, chmod file to 0644 and try again.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1740,7 +1741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
</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">- } elseif ( 'd' == $fileinfo['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'd' === $fileinfo['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1761,6 +1762,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</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">@@ -1924,7 +1926,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 ( ! $method && isset( $args['connection_type'] ) && 'ssh' == $args['connection_type'] && extension_loaded( 'ssh2' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $method && isset( $args['connection_type'] ) && 'ssh' === $args['connection_type'] && extension_loaded( 'ssh2' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $method = 'ssh2';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $method && extension_loaded( 'ftp' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2010,7 +2012,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = get_filesystem_method( array(), $context, $allow_relaxed_file_ownership );
</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 ( 'direct' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'direct' === $type ) {
</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">@@ -2061,9 +2063,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $credentials['port'] );
</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 ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' === FS_METHOD ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ssh';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { // Only the FTP Extension understands SSL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' === $type ) { // Only the FTP Extension understands SSL.
</ins><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftps';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $submitted_form['connection_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = $submitted_form['connection_type'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2070,20 +2072,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! isset( $credentials['connection_type'] ) ) { // All else fails (and it's not defaulted to something else saved), default to FTP.
</span><span class="cx" style="display: block; padding: 0 10px"> $credentials['connection_type'] = 'ftp';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $error &&
- (
- ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) ) ||
- ( 'ssh' == $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
- ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $error
+ && ( ( ! empty( $credentials['password'] ) && ! empty( $credentials['username'] ) && ! empty( $credentials['hostname'] ) )
+ || ( 'ssh' === $credentials['connection_type'] && ! empty( $credentials['public_key'] ) && ! empty( $credentials['private_key'] ) )
+ )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stored_credentials = $credentials;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $stored_credentials['port'] ) ) { // Save port as part of hostname to simplify above code.
</span><span class="cx" style="display: block; padding: 0 10px"> $stored_credentials['hostname'] .= ':' . $stored_credentials['port'];
</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"> unset( $stored_credentials['password'], $stored_credentials['port'], $stored_credentials['private_key'], $stored_credentials['public_key'] );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_installing() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'ftp_credentials', $stored_credentials );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $credentials;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $hostname = isset( $credentials['hostname'] ) ? $credentials['hostname'] : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2208,7 +2213,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $types['ssh'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ssh' != $connection_type || empty( $connection_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ssh' !== $connection_type || empty( $connection_type ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = ' class="hidden"';
</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">@@ -2251,9 +2256,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_print_request_filesystem_credentials_modal() {
</span><span class="cx" style="display: block; padding: 0 10px"> $filesystem_method = get_filesystem_method();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $request_filesystem_credentials = ( 'direct' !== $filesystem_method && ! $filesystem_credentials_are_stored );
</span><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></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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/image-edit.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fwidth = ! empty( $_REQUEST['fwidth'] ) ? intval( $_REQUEST['fwidth'] ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $fheight = ! empty( $_REQUEST['fheight'] ) ? intval( $_REQUEST['fheight'] ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $target = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scale = ! empty( $_REQUEST['do'] ) && 'scale' == $_REQUEST['do'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scale = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $scale && $fwidth > 0 && $fheight > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $size = $img->get_size();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'IMAGE_EDIT_OVERWRITE' ) && IMAGE_EDIT_OVERWRITE &&
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $backup_sizes['full-orig'] ) && $backup_sizes['full-orig']['file'] != $basename ) {
</span><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' == $target ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'thumbnail' === $target ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_path = "{$dirname}/{$filename}-temp.{$ext}";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_path = $path;
</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"> $meta['width'] = $size['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['height'] = $size['height'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $success && ( 'nothumb' == $target || 'all' == $target ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $success && ( 'nothumb' === $target || 'all' === $target ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes = get_intermediate_image_sizes();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'nothumb' == $target ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'nothumb' === $target ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes = array_diff( $sizes, array( 'thumbnail' ) );
</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">@@ -889,7 +889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return->fw = $meta['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $return->fh = $meta['height'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'thumbnail' == $target ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'thumbnail' === $target ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sizes = array( 'thumbnail' );
</span><span class="cx" style="display: block; padding: 0 10px"> $success = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $delete = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,7 +958,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'thumbnail' === $target || 'all' === $target || 'full' === $target ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if it's an image edit from attachment edit screen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' == $_REQUEST['context'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_REQUEST['context'] ) && 'edit-attachment' === $_REQUEST['context'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = wp_get_attachment_image_src( $post_id, array( 900, 600 ), true );
</span><span class="cx" style="display: block; padding: 0 10px"> $return->thumbnail = $thumb_url[0];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/media.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -680,7 +680,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_iframe_src = add_query_arg( 'post_id', (int) $post_id, admin_url( 'media-upload.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 ( $type && 'media' != $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $type && 'media' !== $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $upload_iframe_src = add_query_arg( 'type', $type, $upload_iframe_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">@@ -865,7 +865,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $src = "http://$src";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_POST['media_type'] ) && 'image' != $_POST['media_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['media_type'] ) && 'image' !== $_POST['media_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html( wp_unslash( $_POST['title'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $title ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = esc_html( wp_basename( $src ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -880,7 +880,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ext_type = wp_ext2type( $ext );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'audio' == $ext_type || 'video' == $ext_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'audio' === $ext_type || 'video' === $ext_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $ext_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">@@ -1159,7 +1159,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $checked = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Is this size selectable?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $enabled = ( $downsize[3] || 'full' == $size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $enabled = ( $downsize[3] || 'full' === $size );
</ins><span class="cx" style="display: block; padding: 0 10px"> $css_id = "image-size-{$size}-{$post->ID}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If this size is the default but that's not available, don't select it.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1169,7 +1169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $check = '';
</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 ( ! $check && $enabled && 'thumbnail' != $size ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $check && $enabled && 'thumbnail' !== $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If $check is not enabled, default to the first available size
</span><span class="cx" style="display: block; padding: 0 10px"> * that's bigger than a thumbnail.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1302,7 +1302,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Filtered attachment post object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function image_attachment_fields_to_save( $post, $attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $post['post_mime_type'], 0, 5 ) == 'image' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' === substr( $post['post_mime_type'], 0, 5 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strlen( trim( $post['post_title'] ) ) == 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_url = ( isset( $post['attachment_url'] ) ) ? $post['attachment_url'] : $post['guid'];
</span><span class="cx" style="display: block; padding: 0 10px"> $post['post_title'] = preg_replace( '/\.\w+$/', '', wp_basename( $attachment_url ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1326,7 +1326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function image_media_send_to_editor( $html, $attachment_id, $attachment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $attachment['url'];
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1437,7 +1437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $form_fields = array_merge_recursive( $form_fields, (array) $errors );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This was formerly in image_attachment_fields_to_edit().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $post->post_mime_type, 0, 5 ) == 'image' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alt = get_post_meta( $post->ID, '_wp_attachment_image_alt', true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $alt ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1610,11 +1610,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $display_title = ( ! empty( $title ) ) ? $title : $filename; // $title shouldn't ever be empty, but just in case.
</span><span class="cx" style="display: block; padding: 0 10px"> $display_title = $parsed_args['show_title'] ? "<div class='filename new'><span class='title'>" . wp_html_excerpt( $display_title, 60, '…' ) . '</span></div>' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' == $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' == $redir_tab ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $gallery = ( ( isset( $_REQUEST['tab'] ) && 'gallery' === $_REQUEST['tab'] ) || ( isset( $redir_tab ) && 'gallery' === $redir_tab ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $form_fields as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'menu_order' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'menu_order' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $gallery ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $order = "<div class='menu_order'> <input class='menu_order_input' type='text' id='attachments[$attachment_id][menu_order]' name='attachments[$attachment_id][menu_order]' value='" . esc_attr( $val['value'] ) . "' /></div>";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1725,8 +1725,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $calling_post_id = $post->post_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 ( 'image' == $type && $calling_post_id && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
- && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' ) && get_post_thumbnail_id( $calling_post_id ) != $attachment_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' === $type && $calling_post_id
+ && current_theme_supports( 'post-thumbnails', get_post_type( $calling_post_id ) )
+ && post_type_supports( get_post_type( $calling_post_id ), 'thumbnail' )
+ && get_post_thumbnail_id( $calling_post_id ) != $attachment_id
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $calling_post = get_post( $calling_post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $calling_post_type_object = get_post_type_object( $calling_post->post_type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1769,7 +1772,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'textarea' === $field['input'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_content' == $id && user_can_richedit() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_content' === $id && user_can_richedit() ) {
</ins><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="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1962,7 +1965,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'textarea' === $field['input'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_content' == $id && user_can_richedit() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_content' === $id && user_can_richedit() ) {
</ins><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="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2383,7 +2386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> insert : function() {
</span><span class="cx" style="display: block; padding: 0 10px"> var t = this, html, f = document.forms[0], cls, title = '', alt = '', caption = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == f.src.value || '' == t.width )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === f.src.value || '' === t.width )
</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"> if ( f.alt.value )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2890,7 +2893,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_align = 'none';
</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 ( 'image' == $default_view ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image' === $default_view ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $view = 'image-only';
</span><span class="cx" style="display: block; padding: 0 10px"> $table_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/menu.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/menu.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -333,7 +333,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove the last menu item if it is a separator.
</span><span class="cx" style="display: block; padding: 0 10px"> $last_menu_key = array_keys( $menu );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_menu_key = array_pop( $last_menu_key );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][4] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $menu ) && 'wp-menu-separator' === $menu[ $last_menu_key ][4] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $menu[ $last_menu_key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $last_menu_key );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,15 +46,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="minor-publishing-actions">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="save-action">
</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">- if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $post->post_status, array( 'publish', 'future', 'pending' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $private_style = '';
</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"> $private_style = 'style="display:none"';
</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"> <input <?php echo $private_style; ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save Draft' ); ?>" class="button" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php } elseif ( 'pending' === $post->post_status && $can_publish ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" name="save" id="save-post" value="<?php esc_attr_e( 'Save as Pending' ); ?>" class="button" />
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="spinner"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } ?>
</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"> <div id="preview-action">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_link = esc_url( get_preview_post_link( $post ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_button_text = __( 'Preview Changes' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_button_text = __( 'Preview' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,9 +120,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </span>
</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">- if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status || 'private' === $post->post_status || $can_publish ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $private_style = '';
</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"> $private_style = 'style="display:none"';
</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">@@ -129,18 +129,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="#post_status" <?php echo $private_style; ?> class="edit-post-status hide-if-no-js" role="button"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit status' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="post-status-select" class="hide-if-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' == $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr( ( 'auto-draft' === $post->post_status ) ? 'draft' : $post->post_status ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <label for="post_status" class="screen-reader-text"><?php _e( 'Set status' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="post_status" id="post_status">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'publish' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'publish' === $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e( 'Published' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php elseif ( 'private' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php elseif ( 'private' === $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e( 'Privately Published' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php elseif ( 'future' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php elseif ( 'future' === $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e( 'Scheduled' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e( 'Pending Review' ); ?></option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'auto-draft' == $post->post_status ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'auto-draft' === $post->post_status ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'auto-draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e( 'Draft' ); ?></option>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,13 +210,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $time_format = _x( 'H:i', 'publish box time format' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 != $post->ID ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'future' == $post->post_status ) { // Scheduled for publishing at a future date.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' === $post->post_status ) { // Scheduled for publishing at a future date.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is currently scheduled to be published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Scheduled for: %s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // Already published.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'publish' === $post->post_status || 'private' === $post->post_status ) { // Already published.
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post was published. */
</span><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Published on: %s' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '0000-00-00 00:00:00' === $post->post_date_gmt ) { // Draft, 1 or more saves, no date specified.
</ins><span class="cx" style="display: block; padding: 0 10px"> $stamp = __( 'Publish <b>immediately</b>' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // Draft, 1 or more saves, future date specified.
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Post date information. %s: Date on which the post is to be published. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function post_trackback_meta_box( $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" value="' .
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( str_replace( "\n", ' ', $post->to_ping ) ) . '" aria-describedby="trackback-url-desc" />';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $post->pinged ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' !== $post->pinged ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pings = '<p>' . __( 'Already pinged:' ) . '</p><ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> $already_pinged = explode( "\n", trim( $post->pinged ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $already_pinged as $pinged_url ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1002,7 +1003,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'page_attributes_misc_attributes', $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">- <?php if ( 'page' == $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'page' === $post->post_type && get_current_screen()->get_help_tabs() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="post-attributes-help-text"><?php _e( 'Need help? Use the Help tab above the screen title.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1055,7 +1056,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="delete-action">
</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">- if ( ! empty( $_GET['action'] ) && 'edit' == $_GET['action'] && current_user_can( 'manage_links' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_GET['action'] ) && 'edit' === $_GET['action'] && current_user_can( 'manage_links' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<a class="submitdelete deletion" href="%s" onclick="return confirm( \'%s\' );">%s</a>',
</span><span class="cx" style="display: block; padding: 0 10px"> wp_nonce_url( "link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,21 +1183,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: '';
</span><span class="cx" style="display: block; padding: 0 10px"> $rels = preg_split( '/\s+/', $link_rel );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $value && in_array( $value, $rels, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $value && in_array( $value, $rels, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' checked="checked"';
</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 ( '' == $value ) {
- if ( 'family' == $class && strpos( $link_rel, 'child' ) === false && strpos( $link_rel, 'parent' ) === false && strpos( $link_rel, 'sibling' ) === false && strpos( $link_rel, 'spouse' ) === false && strpos( $link_rel, 'kin' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $value ) {
+ if ( 'family' === $class && strpos( $link_rel, 'child' ) === false && strpos( $link_rel, 'parent' ) === false && strpos( $link_rel, 'sibling' ) === false && strpos( $link_rel, 'spouse' ) === false && strpos( $link_rel, 'kin' ) === false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' checked="checked"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'friendship' == $class && strpos( $link_rel, 'friend' ) === false && strpos( $link_rel, 'acquaintance' ) === false && strpos( $link_rel, 'contact' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'friendship' === $class && strpos( $link_rel, 'friend' ) === false && strpos( $link_rel, 'acquaintance' ) === false && strpos( $link_rel, 'contact' ) === false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' checked="checked"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'geographical' == $class && strpos( $link_rel, 'co-resident' ) === false && strpos( $link_rel, 'neighbor' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'geographical' === $class && strpos( $link_rel, 'co-resident' ) === false && strpos( $link_rel, 'neighbor' ) === false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' checked="checked"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'identity' == $class && in_array( 'me', $rels, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'identity' === $class && in_array( 'me', $rels, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' checked="checked"';
</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">@@ -1421,7 +1422,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"> $publish_callback_args = array( '__back_compat_meta_box' => true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( post_type_supports( $post_type, 'revisions' ) && 'auto-draft' !== $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We should aim to show the revisions meta box only when there are revisions.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1436,7 +1437,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 ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'image-edit' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'imgareaselect' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'submitdiv', __( 'Save' ), 'attachment_submit_meta_box', null, 'side', 'core', array( '__back_compat_meta_box' => true ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1543,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( 'pending' === get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( 'slugdiv', __( 'Slug' ), 'post_slug_meta_box', null, 'normal', 'core', array( '__back_compat_meta_box' => 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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/misc.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +597,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 ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( T_STRING == $tokens[ $t ][0] && ( '(' === $tokens[ $t + 1 ] || '(' === $tokens[ $t + 2 ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If it's a function or class defined locally, there's not going to be any docs available.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ), true ) )
</span><span class="cx" style="display: block; padding: 0 10px"> || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] )
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/ms.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> 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 ( 'upgrade.php' == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'upgrade.php' === $pagenow ) {
</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">@@ -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 && '0' != $user_id ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -935,7 +935,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 ( '' == $user_list ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $user_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_list = $admin_out;
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,17 +31,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $response_format = 'json';
</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 ( 'markup' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'markup' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['walker'] = new Walker_Nav_Menu_Checklist;
</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-post-item' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'get-post-item' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( post_type_exists( $object_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $request['ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $object_id = (int) $request['ID'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'markup' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'markup' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $object_id ) ) ), 0, (object) $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'json' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'json' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $object_id,
</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"> } elseif ( taxonomy_exists( $object_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $request['ID'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $object_id = (int) $request['ID'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'markup' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'markup' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_term( $object_id, $object_type ) ) ), 0, (object) $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'json' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'json' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_obj = get_term( $object_id, $object_type );
</span><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/quick-search-(posttype|taxonomy)-([a-zA-Z_-]*\b)/', $type, $matches ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'posttype' == $matches[1] && get_post_type_object( $matches[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'posttype' === $matches[1] && get_post_type_object( $matches[2] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_obj = _wp_nav_menu_meta_box_object( get_post_type_object( $matches[2] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $args,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,10 +93,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $search_results_query->have_posts() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = $search_results_query->next_post();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'markup' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'markup' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $var_by_ref = $post->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( get_post( $var_by_ref ) ) ), 0, (object) $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'json' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'json' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $post->ID,
</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"> echo "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'taxonomy' == $matches[1] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'taxonomy' === $matches[1] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = get_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => $matches[2],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,9 +120,9 @@
</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"> foreach ( (array) $terms as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'markup' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'markup' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo walk_nav_menu_tree( array_map( 'wp_setup_nav_menu_item', array( $term ) ), 0, (object) $args );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'json' == $response_format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'json' === $response_format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo wp_json_encode(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => $term->term_id,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +231,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $post_type->name;
</span><span class="cx" style="display: block; padding: 0 10px"> // Give pages a higher priority.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $priority = ( 'page' == $post_type->name ? 'core' : 'default' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $priority = ( 'page' === $post_type->name ? 'core' : 'default' );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_meta_box( "add-post-type-{$id}", $post_type->labels->name, 'wp_nav_menu_item_post_type_meta_box', 'nav-menus', 'side', $priority, $post_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">@@ -368,11 +368,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Posts Page and Privacy Policy Page at the top of the list.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $important_pages = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_type_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_type_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suppress_page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert Front Page or custom Home link.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $front_page_obj = null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $front_page ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,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"> // Insert Posts Page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $posts_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_page_obj = get_post( $posts_page );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,17 +508,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="posttype-<?php echo $post_type_name; ?>-tabs" class="posttype-tabs add-menu-item-tabs">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'most-recent' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'most-recent' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-most-recent" href="<?php echo $most_recent_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Most Recent' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="<?php echo esc_attr( $post_type_name ); ?>-all" href="<?php echo $view_all_url; ?>#<?php echo $post_type_name; ?>-all">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'View All' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-posttype-<?php echo esc_attr( $post_type_name ); ?>-search" href="<?php echo $search_url; ?>#tabs-panel-posttype-<?php echo $post_type_name; ?>-search">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Search' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +525,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- .posttype-tabs -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php _e( 'Most Recent' ); ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-posttype-<?php echo $post_type_name; ?>-most-recent" class="tabs-panel <?php echo ( 'most-recent' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php _e( 'Most Recent' ); ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $recent_args = array_merge(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,7 +560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-posttype-<?php echo $post_type_name; ?>-search" role="region" aria-label="<?php echo $post_type->labels->search_items; ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] );
</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"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="<?php echo $post_type_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $post_type->labels->all_items; ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $page_links ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="add-menu-item-pagelinks">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $page_links; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,17 +795,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
</span><span class="cx" style="display: block; padding: 0 10px"> <ul id="taxonomy-<?php echo $taxonomy_name; ?>-tabs" class="taxonomy-tabs add-menu-item-tabs">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'most-used' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'most-used' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-pop" href="<?php echo $most_used_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-pop">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $taxonomy->labels->most_used ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'all' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'all' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-<?php echo esc_attr( $taxonomy_name ); ?>-all" href="<?php echo $view_all_url; ?>#tabs-panel-<?php echo $taxonomy_name; ?>-all">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'View All' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li <?php echo ( 'search' == $current_tab ? ' class="tabs"' : '' ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li <?php echo ( 'search' === $current_tab ? ' class="tabs"' : '' ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a class="nav-tab-link" data-type="tabs-panel-search-taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>" href="<?php echo $search_url; ?>#tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Search' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</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"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> </ul><!-- .taxonomy-tabs -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-pop" class="tabs-panel <?php echo ( 'most-used' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->most_used; ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <ul id="<?php echo $taxonomy_name; ?>checklist-pop" class="categorychecklist form-no-clear" >
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $popular_terms = get_terms(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -830,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div id="tabs-panel-<?php echo $taxonomy_name; ?>-all" class="tabs-panel tabs-panel-view-all <?php echo ( 'all' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" role="region" aria-label="<?php echo $taxonomy->labels->all_items; ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! empty( $page_links ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="add-menu-item-pagelinks">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo $page_links; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -849,7 +849,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- /.tabs-panel -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="tabs-panel <?php echo ( 'search' == $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="tabs-panel <?php echo ( 'search' === $current_tab ? 'tabs-panel-active' : 'tabs-panel-inactive' ); ?>" id="tabs-panel-search-taxonomy-<?php echo $taxonomy_name; ?>" role="region" aria-label="<?php echo $taxonomy->labels->search_items; ?>" tabindex="0">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $searched = esc_attr( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -931,7 +931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Or URL is the default.
</span><span class="cx" style="display: block; padding: 0 10px"> in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ), true ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> // Or it's not a custom menu item (but not the custom home page).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! ( 'custom' === $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> // Or it *is* a custom menu item that already exists.
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $_item_object_data['menu-item-db-id'] )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -987,7 +987,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_nav_menu_meta_box_object( $object = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $object->name ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $object->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $object->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object->_default_query = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'menu_order title',
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => 'publish',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -994,13 +994,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"> // Posts should show only published items.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post' == $object->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $object->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object->_default_query = array(
</span><span class="cx" style="display: block; padding: 0 10px"> '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="cx" style="display: block; padding: 0 10px"> // Categories should be in reverse chronological order.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'category' == $object->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'category' === $object->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object->_default_query = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'id',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => 'DESC',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1066,7 +1066,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $some_pending_menu_items = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $some_invalid_menu_items = false;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $menu_items as $menu_item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $menu_item->post_status ) && 'draft' == $menu_item->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $menu_item->post_status ) && 'draft' === $menu_item->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $some_pending_menu_items = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $menu_item->_invalid ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,7 +1182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['menu-item-db-id'] as $_key => $k ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Menu item title can't be blank.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' == $_POST['menu-item-title'][ $_key ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $_POST['menu-item-title'][ $_key ] ) || '' === $_POST['menu-item-title'][ $_key ] ) {
</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></pre></div>
<a id="trunksrcwpadminincludesoptionsphp"></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/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/options.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/options.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,16 +49,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $siteName.text( title );
</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">- $("input[name='date_format']").click(function(){
- if ( "date_format_custom_radio" != $(this).attr("id") )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( 'input[name="date_format"]' ).click( function() {
+ if ( 'date_format_custom_radio' !== $(this).attr( 'id' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'input[name="date_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'input[name="date_format_custom"]' ).on( 'click input', function() {
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#date_format_custom_radio' ).prop( 'checked', 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">- $("input[name='time_format']").click(function(){
- if ( "time_format_custom_radio" != $(this).attr("id") )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( 'input[name="time_format"]' ).click( function() {
+ if ( 'time_format_custom_radio' !== $(this).attr( 'id' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $( 'input[name="time_format_custom"]' ).val( $( this ).val() ).closest( 'fieldset' ).find( '.example' ).text( $( this ).parent( 'label' ).children( '.format-i18n' ).text() );
</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">@@ -80,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> spinner.addClass( 'is-active' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $.post( ajaxurl, {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- action: 'date_format_custom' == format.attr( 'name' ) ? 'date_format' : 'time_format',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ action: 'date_format_custom' === format.attr( 'name' ) ? 'date_format' : 'time_format',
</ins><span class="cx" style="display: block; padding: 0 10px"> date : format.val()
</span><span class="cx" style="display: block; padding: 0 10px"> }, function( d ) { spinner.removeClass( 'is-active' ); example.text( d ); } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin-install.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/plugin-install.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $args = (object) $args;
</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 ( 'query_plugins' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'query_plugins' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args->per_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args->per_page = 24;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -462,7 +462,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 ( 'install' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'install' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( WP_PLUGIN_DIR . '/' . $api->slug ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $installed_plugin = get_plugins( '/' . $api->slug );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $installed_plugin ) ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/plugin.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -91,7 +91,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.0.0', sprintf( __( 'The %1$s plugin header is deprecated. Use %2$s instead.' ), '<code>Site Wide Only: true</code>', '<code>Network: true</code>' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['Network'] = $plugin_data['_sitewide'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $plugin_data['Network'] = ( 'true' == strtolower( $plugin_data['Network'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $plugin_data['Network'] = ( 'true' === strtolower( $plugin_data['Network'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $plugin_data['_sitewide'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If no text domain is defined fall back to the plugin slug.
</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"> load_plugin_textdomain( $textdomain, false, dirname( $plugin_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">- } elseif ( 'hello.php' == basename( $plugin_file ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'hello.php' === basename( $plugin_file ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $textdomain = 'default';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $textdomain ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -295,30 +295,36 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Files in wp-content/plugins directory.
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_dir = @ opendir( $plugin_root );
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_files = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $plugins_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $file, 0, 1 ) == '.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === substr( $file, 0, 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( $plugin_root . '/' . $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_subdir = @ opendir( $plugin_root . '/' . $file );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $plugins_subdir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $subfile = readdir( $plugins_subdir ) ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $subfile, 0, 1 ) == '.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === substr( $subfile, 0, 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $subfile, -4 ) == '.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '.php' === substr( $subfile, -4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_files[] = "$file/$subfile";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> closedir( $plugins_subdir );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $file, -4 ) == '.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.php' === substr( $file, -4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_files[] = $file;
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> closedir( $plugins_dir );
</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">@@ -369,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins_dir = @opendir( WPMU_PLUGIN_DIR );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $plugins_dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $file = readdir( $plugins_dir ) ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $file, -4 ) == '.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.php' === substr( $file, -4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_files[] = $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">@@ -1444,7 +1450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Backward-compatibility for plugins using add_management_page().
</span><span class="cx" style="display: block; padding: 0 10px"> * See wp-admin/admin.php for redirect from edit.php to tools.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 ( 'tools.php' == $parent_slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'tools.php' === $parent_slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_registered_pages[ get_plugin_page_hookname( $menu_slug, 'edit.php' ) ] = 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">@@ -1836,7 +1842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $parent_file, $menu, $submenu, $pagenow, $typenow,
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_page, $_wp_real_parent_file, $_wp_menu_nopriv, $_wp_submenu_nopriv;
</span><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( $parent ) && 'admin.php' != $parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $parent ) && 'admin.php' !== $parent ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2018,7 +2024,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = get_admin_page_parent( $parent_page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page_type = 'admin';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $parent_page ) || 'admin.php' == $parent_page || isset( $admin_page_hooks[ $plugin_page ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $parent_page ) || 'admin.php' === $parent_page || isset( $admin_page_hooks[ $plugin_page ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $admin_page_hooks[ $plugin_page ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $page_type = 'toplevel';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $admin_page_hooks[ $parent ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2165,7 +2171,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">@@ -2200,7 +2206,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></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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/post.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,13 +30,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype = get_post_type_object( $post_data['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,13 +75,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,19 +103,21 @@
</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"> // What to do based on which button they pressed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['saveasdraft'] ) && '' != $post_data['saveasdraft'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['saveasdraft'] ) && '' !== $post_data['saveasdraft'] ) {
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['saveasprivate'] ) && '' != $post_data['saveasprivate'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['saveasprivate'] ) && '' !== $post_data['saveasprivate'] ) {
</ins><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'] ) || 'private' !== $post_data['post_status'] ) ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['advanced'] ) && '' != $post_data['advanced'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['advanced'] ) && '' !== $post_data['advanced'] ) {
</ins><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['pending'] ) && '' != $post_data['pending'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['pending'] ) && '' !== $post_data['pending'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = 'pending';
</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">@@ -126,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : 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 ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['post_status'] ) && 'private' === $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = $previous_status ? $previous_status : 'pending';
</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">@@ -247,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'inherit' == $post_data['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'inherit' === $post_data['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['post_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">@@ -254,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype = get_post_type_object( $post_data['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_data['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this page.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,7 +378,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"> // Attachment stuff.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' == $post_data['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post_data['post_type'] ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $ptype->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $ptype->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit pages.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit posts.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,7 +487,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_data['post_status'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_status'] = sanitize_key( $post_data['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'inherit' == $post_data['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'inherit' === $post_data['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['post_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">@@ -508,7 +510,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 ( $reset as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data[ $field ] ) && ( '' == $post_data[ $field ] || -1 == $post_data[ $field ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data[ $field ] ) && ( '' === $post_data[ $field ] || -1 == $post_data[ $field ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data[ $field ] );
</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">@@ -632,7 +634,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updated[] = wp_update_post( $post_data );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'sticky' == $post_data['sticky'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'sticky' === $post_data['sticky'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> stick_post( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> unstick_post( $post_ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,7 +815,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $ptype->cap->edit_posts ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $ptype->name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $ptype->name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,12 +914,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $metavalue = trim( $metavalue );
</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 ( ( ( '#NONE#' != $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ( '#NONE#' !== $metakeyselect ) && ! empty( $metakeyselect ) ) || ! empty( $metakeyinput ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * We have a key/value pair. If both the select and the input
</span><span class="cx" style="display: block; padding: 0 10px"> * for the key have data, the input takes precedence.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '#NONE#' != $metakeyselect ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '#NONE#' !== $metakeyselect ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $metakey = $metakeyselect;
</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">@@ -1143,7 +1145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['order'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $order = $q['order'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $q['post_status'] ) && 'pending' == $q['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $q['post_status'] ) && 'pending' === $q['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $order = 'ASC';
</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">@@ -1220,8 +1222,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $states .= ',private';
</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">- $q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
- $q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $q['post_status'] = isset( $q['status'] ) && 'trash' === $q['status'] ? 'trash' : $states;
+ $q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' === $q['attachment-filter'] ? 'trash' : $states;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $media_per_page = (int) get_user_option( 'upload_per_page' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $media_per_page ) || $media_per_page < 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1243,17 +1245,17 @@
</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_keys( $post_mime_types ) as $type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" === $q['attachment-filter'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['post_mime_type'] = $type;
</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><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['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' === $q['attachment-filter'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['post_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 ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' == $q['attachment-filter'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['mine'] ) || ( isset( $q['attachment-filter'] ) && 'mine' === $q['attachment-filter'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['author'] = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1458,7 +1460,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"> // 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' ) && get_option( 'page_on_front' ) == $id ) ) {
</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">@@ -1682,7 +1686,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'edit.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' !== $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
</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">@@ -1700,7 +1704,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $locked ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_type_object( $post->post_type )->public ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status || $user->ID != $post->post_author ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Latest content is in autosave.
</span><span class="cx" style="display: block; padding: 0 10px"> $nonce = wp_create_nonce( 'post_preview_' . $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args['preview_id'] = $post->ID;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1888,12 +1892,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $is_autosave = 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 ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'draft' == $post->post_status || 'auto-draft' == $post->post_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
+ && ( 'draft' === $post->post_status || 'auto-draft' === $post->post_status )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $saved_post_id = edit_post();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_autosave = 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 ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_POST['post_status'] ) && 'auto-draft' === $_POST['post_status'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['post_status'] = 'draft';
</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">@@ -1953,7 +1959,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to edit this item.' ) );
</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 ( 'auto-draft' == $post->post_status ) {
</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['post_status'] = 'draft';
</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">@@ -1961,7 +1967,9 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author
+ && ( 'auto-draft' === $post->post_status || 'draft' === $post->post_status )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked.
</span><span class="cx" style="display: block; padding: 0 10px"> return edit_post( wp_slash( $post_data ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1994,7 +2002,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $message = 6;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $message = 'draft' == $status ? 10 : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $message = 'draft' === $status ? 10 : 1;
</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"> $location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludesschemaphp"></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/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/schema.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -958,10 +958,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb, $current_site, $wp_rewrite;
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $domain ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $domain ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'empty_domain', __( 'You must provide a domain name.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $site_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $site_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
</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="trunksrcwpadminincludesscreenphp"></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/screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/screen.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/screen.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,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"> // Submit box cannot be hidden.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'submitdiv' == $box['id'] || 'linksubmitdiv' == $box['id'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'submitdiv' === $box['id'] || 'linksubmitdiv' === $box['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">@@ -161,8 +161,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Hide slug boxes by default.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $use_defaults ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $screen->base ) {
- if ( 'post' == $screen->post_type || 'page' == $screen->post_type || 'attachment' == $screen->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $screen->base ) {
+ if ( in_array( $screen->post_type, array( 'post', 'page', 'attachment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hidden = array( 'slugdiv', 'trackbacksdiv', 'postcustom', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = array( 'slugdiv' );
</span></span></pre></div>
<a id="trunksrcwpadminincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/taxonomy.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/taxonomy.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $catarr = wp_parse_args( $catarr, $cat_defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( trim( $catarr['cat_name'] ) == '' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === trim( $catarr['cat_name'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2330,7 +2330,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 ( 2 == test ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '"wpCompressionTest' == r )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"wpCompressionTest' === r )
</ins><span class="cx" style="display: block; padding: 0 10px"> this.get('yes');
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> this.get('no');
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/theme.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $args = (object) $args;
</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 ( 'query_themes' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'query_themes' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $args->per_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args->per_page = 24;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,13 +583,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"> // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'query_themes' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'query_themes' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $res->themes as $i => $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $res->themes[ $i ] = (object) $theme;
</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"> // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'feature_list' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'feature_list' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $res = (array) $res;
</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="trunksrcwpadminincludesupdatecorephp"></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-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update-core.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/update-core.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1041,7 +1041,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $checksums ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $checksums as $file => $checksum ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wp-content' == substr( $file, 0, 10 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp-content' === substr( $file, 0, 10 ) ) {
</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( ABSPATH . $file ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1114,7 +1114,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $failed = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $checksums ) && is_array( $checksums ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $checksums as $file => $checksum ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wp-content' == substr( $file, 0, 10 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp-content' === substr( $file, 0, 10 ) ) {
</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( $working_dir_local . $file ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1187,7 +1187,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete( $maintenance_file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.5 -> 3.5+ - an empty twentytwelve directory was created upon upgrade to 3.5 for some users, preventing installation of Twenty Twelve.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '3.5' == $old_wp_version ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '3.5' === $old_wp_version ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( WP_CONTENT_DIR . '/themes/twentytwelve' ) && ! file_exists( WP_CONTENT_DIR . '/themes/twentytwelve/style.css' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->delete( $wp_filesystem->wp_themes_dir() . 'twentytwelve/' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1203,17 +1203,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_new_bundled_files as $file => $introduced_version ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If a $development_build or if $introduced version is greater than what the site was previously running.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $development_build || version_compare( $introduced_version, $old_wp_version, '>' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $directory = ( '/' == $file[ strlen( $file ) - 1 ] );
- list($type, $filename) = explode( '/', $file, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $directory = ( '/' === $file[ strlen( $file ) - 1 ] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ list( $type, $filename ) = explode( '/', $file, 2 );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Check to see if the bundled items exist before attempting to copy them.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->exists( $from . $distro . 'wp-content/' . $file ) ) {
</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 ( 'plugins' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'plugins' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dest = $wp_filesystem->wp_plugins_dir();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'themes' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'themes' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back-compat, ::wp_themes_dir() did not return trailingslash'd pre-3.2.
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = trailingslashit( $wp_filesystem->wp_themes_dir() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1343,7 +1344,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 ( 'f' == $fileinfo['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'f' === $fileinfo['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->copy( $from . $filename, $to . $filename, true, FS_CHMOD_FILE ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If copy failed, chmod file to 0644 and try again.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1351,7 +1352,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
</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">- } elseif ( 'd' == $fileinfo['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'd' === $fileinfo['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->is_dir( $to . $filename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wp_filesystem->mkdir( $to . $filename, FS_CHMOD_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1399,11 +1400,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"> // Ensure we only run this on the update-core.php page. The Core_Upgrader may be used in other contexts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'update-core.php' != $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'update-core.php' !== $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'do-core-upgrade' !== $action && 'do-core-reinstall' !== $action ) {
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/update.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,7 +95,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $auto_update = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader = new WP_Automatic_Updater;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $updates->updates as $update ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'autoupdate' != $update->response ) {
</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">@@ -285,7 +285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $pagenow;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'update-core.php' == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'update-core.php' === $pagenow ) {
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,7 +862,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $posts = $wpdb->get_results( "SELECT ID, post_title, post_name FROM $wpdb->posts WHERE post_name = ''" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $post->post_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $post->post_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $newtitle = sanitize_title( $post->post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_name = %s WHERE ID = %d", $newtitle, $post->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -871,7 +871,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = $wpdb->get_results( "SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories" );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $categories as $category ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $category->category_nicename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $category->category_nicename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $newtitle = sanitize_title( $category->cat_name );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->categories, array( 'category_nicename' => $newtitle ), array( 'cat_ID' => $category->cat_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> // Set user_nicename.
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $wpdb->get_results( "SELECT ID, user_nickname, user_nicename FROM $wpdb->users" );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $users as $user ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $user->user_nicename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $user->user_nicename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $newname = sanitize_title( $user->user_nickname );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->users, array( 'user_nicename' => $newname ), array( 'ID' => $user->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -982,7 +982,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * MAX(post_date_gmt) can't be '0000-00-00 00:00:00'.
</span><span class="cx" style="display: block; padding: 0 10px"> * <michel_v> I just slapped myself silly for not thinking about it earlier.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $got_gmt_fields = ! ( $wpdb->get_var( "SELECT MAX(post_date_gmt) FROM $wpdb->posts" ) == '0000-00-00 00:00:00' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $got_gmt_fields = ( '0000-00-00 00:00:00' !== $wpdb->get_var( "SELECT MAX(post_date_gmt) FROM $wpdb->posts" ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $got_gmt_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1226,10 +1226,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $status = $post->post_status;
</span><span class="cx" style="display: block; padding: 0 10px"> $type = '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 ( 'static' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'static' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'page';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'attachment' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'attachment' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'inherit';
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = (int) $post->post_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $term_id = (int) $post->category_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'category';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $post->rel_type ) && 'tag' == $post->rel_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $post->rel_type ) && 'tag' === $post->rel_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = 'tag';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $tt_id = $tt_ids[ $term_id ][ $taxonomy ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1475,7 +1475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Recalculate all counts.
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $wpdb->get_results( "SELECT term_taxonomy_id, taxonomy FROM $wpdb->term_taxonomy" );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'post_tag' == $term->taxonomy ) || ( 'category' == $term->taxonomy ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' === $term->taxonomy || 'category' === $term->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships, $wpdb->posts WHERE $wpdb->posts.ID = $wpdb->term_relationships.object_id AND post_status = 'publish' AND post_type = 'post' AND term_taxonomy_id = %d", $term->term_taxonomy_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->term_relationships WHERE term_taxonomy_id = %d", $term->term_taxonomy_id ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1815,7 +1815,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_current_db_version < 20080 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'yes' == $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'yes' === $wpdb->get_var( "SELECT autoload FROM $wpdb->options WHERE option_name = 'uninstall_plugins'" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $uninstall_plugins = get_option( 'uninstall_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'uninstall_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_option( 'uninstall_plugins', $uninstall_plugins, null, 'no' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2291,7 +2291,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $indexes = $wpdb->get_results( "SHOW INDEXES FROM $wpdb->signups" );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $indexes as $index ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'domain_path' == $index->Key_name && 'domain' == $index->Column_name && 140 != $index->Sub_part ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'domain_path' === $index->Key_name && 'domain' === $index->Column_name && 140 != $index->Sub_part ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $upgrade = 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">@@ -2501,7 +2501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $options ) {
</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 ( 'siteurl' == $option->option_name || 'home' == $option->option_name || 'category_base' == $option->option_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'siteurl' === $option->option_name || 'home' === $option->option_name || 'category_base' === $option->option_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $option->option_value = untrailingslashit( $option->option_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $all_options->{$option->option_name} = stripslashes( $option->option_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2535,11 +2535,11 @@
</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 ( in_array( $setting, array( 'siteurl', 'home', 'category_base', 'tag_base' ), true ) ) {
</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">@@ -2915,7 +2915,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">@@ -3270,7 +3270,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = __get_option( 'active_plugins' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $plugins as $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( basename( $plugin ) == 'widgets.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'widgets.php' === basename( $plugin ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_splice( $plugins, array_search( $plugin, $plugins, true ), 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'active_plugins', $plugins );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/user.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : '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">- $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' === $_POST['comment_shortcuts'] ? 'true' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user->use_ssl = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['use_ssl'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,7 +142,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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -474,7 +474,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"> // get_user_setting() = JS-saved UI setting. Else no-js-fallback code.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'hide' == get_user_setting( 'default_password_nag' ) || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'hide' === get_user_setting( 'default_password_nag' )
+ || isset( $_GET['default_password_nag'] ) && '0' == $_GET['default_password_nag']
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_user_setting( 'default_password_nag' );
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( $user_ID, 'default_password_nag', false, true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +511,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function default_password_nag() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $pagenow;
</span><span class="cx" style="display: block; padding: 0 10px"> // Short-circuit it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'profile.php' == $pagenow || ! get_user_option( 'default_password_nag' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'profile.php' === $pagenow || ! get_user_option( 'default_password_nag' ) ) {
</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="trunksrcwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/widgets.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/includes/widgets.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,7 +225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * We aren't showing a widget control, we're outputting a template
</span><span class="cx" style="display: block; padding: 0 10px"> * for a multi-widget control.
</span><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( $sidebar_args['_display'] ) && 'template' == $sidebar_args['_display'] && $widget_number ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $sidebar_args['_display'] ) && 'template' === $sidebar_args['_display'] && $widget_number ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // number == -1 implies a template where id numbers are replaced by a generic '__i__'.
</span><span class="cx" style="display: block; padding: 0 10px"> $control['params'][0]['number'] = -1;
</span><span class="cx" style="display: block; padding: 0 10px"> // With id_base widget id's are constructed like {$id_base}-{$id_number}.
</span></span></pre></div>
<a id="trunksrcwpadminmaintrepairphp"></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/maint/repair.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/maint/repair.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/maint/repair.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,7 +96,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check = $wpdb->get_row( "CHECK TABLE $table" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'OK' == $check->Msg_text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'OK' === $check->Msg_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Table name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $repair = $wpdb->get_row( "REPAIR TABLE $table" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br /> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'OK' == $check->Msg_text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'OK' === $check->Msg_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Table name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,7 +121,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check = $wpdb->get_row( "ANALYZE TABLE $table" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br /> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'Table is already up to date' == $check->Msg_text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'Table is already up to date' === $check->Msg_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Table name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check = $wpdb->get_row( "OPTIMIZE TABLE $table" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<br /> ';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'OK' === $check->Msg_text || 'Table is already up to date' === $check->Msg_text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Table name. */
</span><span class="cx" style="display: block; padding: 0 10px"> printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> echo '<h1 class="screen-reader-text">' . __( 'WordPress database repair' ) . '</h1>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_GET['referrer'] ) && 'is_blog_installed' == $_GET['referrer'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['referrer'] ) && 'is_blog_installed' === $_GET['referrer'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the “Repair Database” button. Repairing can take a while, so please be patient.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></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/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/nav-menus.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +421,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Are we on the add new screen?
</span><span class="cx" style="display: block; padding: 0 10px"> $add_new_screen = ( isset( $_GET['menu'] ) && 0 == $_GET['menu'] ) ? true : 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">-$locations_screen = ( isset( $_GET['action'] ) && 'locations' == $_GET['action'] ) ? true : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$locations_screen = ( isset( $_GET['action'] ) && 'locations' === $_GET['action'] ) ? true : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If we have one theme location, and zero menus, we take them right
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -470,7 +470,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"> // On deletion of menu, if another menu exists, show it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! $add_new_screen && 0 < $menu_count && isset( $_GET['action'] ) && 'delete' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_selected_id = $nav_menus[0]->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="trunksrcwpadminnetworkphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/network.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! network_domain_check() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' === $result->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> network_step2( $result );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> network_step1( $result );
</span></span></pre></div>
<a id="trunksrcwpadminoptionsdiscussionphp"></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-discussion.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-discussion.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/options-discussion.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,11 +125,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input name="page_comments" type="checkbox" id="page_comments" value="1" <?php checked( '1', get_option( 'page_comments' ) ); ?> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page = '</label> <label for="default_comments_page"><select name="default_comments_page" id="default_comments_page"><option value="newest"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'newest' == get_option( 'default_comments_page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'newest' === get_option( 'default_comments_page' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page .= ' selected="selected"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page .= '>' . __( 'last' ) . '</option><option value="oldest"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'oldest' == get_option( 'default_comments_page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'oldest' === get_option( 'default_comments_page' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page .= ' selected="selected"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $default_comments_page .= '>' . __( 'first' ) . '</option></select>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -146,11 +146,11 @@
</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"> $comment_order = '<select name="comment_order" id="comment_order"><option value="asc"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'asc' == get_option( 'comment_order' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'asc' === get_option( 'comment_order' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_order .= ' selected="selected"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_order .= '>' . __( 'older' ) . '</option><option value="desc"';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'desc' == get_option( 'comment_order' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'desc' === get_option( 'comment_order' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_order .= ' selected="selected"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_order .= '>' . __( 'newer' ) . '</option></select>';
</span></span></pre></div>
<a id="trunksrcwpadminoptionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/options.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,7 +64,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( $redirect ) );
</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 ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' === $_GET['dismiss'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'dismiss-' . get_current_blog_id() . '-new_admin_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'adminhash' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_option( 'new_admin_email' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,8 +204,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'update' == $action ) { // We are saving settings sent from a settings page.
- if ( 'options' == $option_page && ! isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'update' === $action ) { // We are saving settings sent from a settings page.
+ if ( 'options' === $option_page && ! isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
</ins><span class="cx" style="display: block; padding: 0 10px"> $unregistered = true;
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'update-options' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> );
</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 ( 'options' == $option_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'options' === $option_page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && ! current_user_can( 'manage_network_options' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to modify unregistered settings for this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,14 +232,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = $whitelist_options[ $option_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 ( 'general' == $option_page ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'general' === $option_page ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Handle custom date/time formats.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $_POST['date_format'] ) && isset( $_POST['date_format_custom'] ) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['date_format'] ) && isset( $_POST['date_format_custom'] )
+ && '\c\u\s\t\o\m' === wp_unslash( $_POST['date_format'] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['date_format'] = $_POST['date_format_custom'];
</span><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['time_format'] ) && isset( $_POST['time_format_custom'] ) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! empty( $_POST['time_format'] ) && isset( $_POST['time_format_custom'] )
+ && '\c\u\s\t\o\m' === wp_unslash( $_POST['time_format'] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['time_format'] = $_POST['time_format_custom'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_POST['timezone_string'] ) && preg_match( '/^UTC[+-]/', $_POST['timezone_string'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['gmt_offset'] = $_POST['timezone_string'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -335,9 +341,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $options as $option ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $disabled = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $option->option_name ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' === $option->option_name ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_serialized( $option->option_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_serialized_string( $option->option_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This is a serialized string, so we should display it.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,6 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options_to_update[] = $option->option_name;
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'all-options';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = esc_attr( $option->option_name );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span></span></pre></div>
<a id="trunksrcwpadminplugineditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugin-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-editor.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/plugin-editor.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $content = file_get_contents( $real_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 ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( '.php' === substr( $real_file, strrpos( $real_file, '.' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $functions = wp_doc_link_parse( $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $functions ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminplugininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugin-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugin-install.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/plugin-install.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @subpackage Administration
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> // TODO: Route this page via a specific iframe handler instead of the do_action below.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' == $_GET['tab'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['tab'] ) && ( 'plugin-information' === $_GET['tab'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'IFRAME_REQUEST', 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="trunksrcwpadminpluginsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/plugins.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/plugins.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/plugins.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = activate_plugin( $plugin, self_admin_url( 'plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'unexpected_output' == $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'unexpected_output' === $result->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect = self_admin_url( 'plugins.php?error=true&charsout=' . strlen( $result->get_error_data() ) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s" );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( add_query_arg( '_error_nonce', wp_create_nonce( 'plugin-activation-error_' . $plugin ), $redirect ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,10 +62,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'recently_activated', $recent );
</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['from'] ) && 'import' == $_GET['from'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['from'] ) && 'import' === $_GET['from'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix.
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( self_admin_url( 'import.php?import=' . str_replace( '-importer', '', dirname( $plugin ) ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_GET['from'] ) && 'press-this' == $_GET['from'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_GET['from'] ) && 'press-this' === $_GET['from'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( self_admin_url( 'press-this.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Overrides the ?error=true one above.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -292,7 +292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = dirname( $plugin );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $plugin_slug ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $plugin_slug ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_info[ $plugin ] = $data;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,7 +579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin deactivated.' ); ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( isset( $_GET['deactivate-multi'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible"><p><?php _e( 'Selected plugins deactivated.' ); ?></p></div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php elseif ( 'update-selected' == $action ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php elseif ( 'update-selected' === $action ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible"><p><?php _e( 'All selected plugins are up to date.' ); ?></p></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php elseif ( isset( $_GET['resume'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="updated notice is-dismissible"><p><?php _e( 'Plugin resumed.' ); ?></p></div>
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/post-new.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,10 +25,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $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 ( 'post' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'post' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'edit.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'post-new.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp_redirect( admin_url( 'media-new.php' ) ) ) {
</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="trunksrcwpadminpostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/post.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/post.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['deletepost'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = 'delete';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' == $_POST['wp-preview'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $_POST['wp-preview'] ) && 'dopreview' === $_POST['wp-preview'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'preview';
</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">@@ -57,7 +57,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sendback ||
</span><span class="cx" style="display: block; padding: 0 10px"> false !== strpos( $sendback, 'post.php' ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> false !== strpos( $sendback, 'post-new.php' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'upload.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'edit.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'postajaxpost':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'post':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'add-' . $post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = 'postajaxpost' == $action ? edit_post() : write_post();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = 'postajaxpost' === $action ? edit_post() : write_post();
</ins><span class="cx" style="display: block; padding: 0 10px"> redirect_post( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> exit();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
</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 ( 'trash' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'You can’t edit this item because it is in the Trash. Please restore it and try again.' ) );
</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">@@ -151,11 +151,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"> $post_type = $post->post_type;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'edit.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'edit.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_new_file = 'post-new.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_file = 'upload.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $submenu_file = 'upload.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $post_new_file = 'media-new.php';
</span></span></pre></div>
<a id="trunksrcwpadminsetupconfigphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/setup-config.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/setup-config.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/setup-config.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -354,7 +354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $key = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $config_file as $line_num => $line ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '$table_prefix =' == substr( $line, 0, 15 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '$table_prefix =' === substr( $line, 0, 15 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $config_file[ $line_num ] = '$table_prefix = \'' . addcslashes( $prefix, "\\'" ) . "';\r\n";
</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="trunksrcwpadminthemeeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/theme-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/theme-editor.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/theme-editor.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'The requested theme does not exist.' ) );
</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->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( $theme->errors() && 'theme_no_stylesheet' === $theme->errors()->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><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"> $f = fopen( $file, 'r' );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = fread( $f, filesize( $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 ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.php' === substr( $file, strrpos( $file, '.' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $functions = wp_doc_link_parse( $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $docs_select = '<select name="docs-list" id="docs-list">';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <select name="theme" id="theme">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_themes( array( 'errors' => null ) ) as $a_stylesheet => $a_theme ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $a_theme->errors() && 'theme_no_stylesheet' == $a_theme->errors()->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $a_theme->errors() && 'theme_no_stylesheet' === $a_theme->errors()->get_error_code() ) {
</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></pre></div>
<a id="trunksrcwpadminthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/themes.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/themes.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'switch_themes' ) && isset( $_GET['action'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'activate' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'activate' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'switch-theme_' . $_GET['stylesheet'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( $_GET['stylesheet'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url( 'themes.php?resumed=true' ) );
</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 ( 'delete' == $_GET['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'delete' === $_GET['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'delete-theme_' . $_GET['stylesheet'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = wp_get_theme( $_GET['stylesheet'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> if ( is_array( $submenu ) && isset( $submenu['themes.php'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $submenu['themes.php'] as $item ) {
</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 ( 'themes.php' == $item[2] || 'theme-editor.php' == $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'themes.php' === $item[2] || 'theme-editor.php' === $item[2] || 0 === strpos( $item[2], 'customize.php' ) ) {
</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"> // 0 = name, 1 = capability, 2 = file.
</span></span></pre></div>
<a id="trunksrcwpadminupdatecorephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update-core.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update-core.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/update-core.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -690,9 +690,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_GET['action'] ) ? $_GET['action'] : 'upgrade-core';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrade_error = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ( 'do-theme-upgrade' == $action || ( 'do-plugin-upgrade' == $action && ! isset( $_GET['plugins'] ) ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ( 'do-theme-upgrade' === $action || ( 'do-plugin-upgrade' === $action && ! isset( $_GET['plugins'] ) ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> && ! isset( $_POST['checked'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $upgrade_error = 'do-theme-upgrade' == $action ? 'themes' : 'plugins';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $upgrade_error = ( 'do-theme-upgrade' === $action ) ? 'themes' : 'plugins';
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = 'upgrade-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">@@ -731,7 +731,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'upgrade-core' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'upgrade-core' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Force a update check when requested.
</span><span class="cx" style="display: block; padding: 0 10px"> $force_check = ! empty( $_GET['force-check'] );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_version_check( array(), $force_check );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -795,7 +795,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-footer.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">-} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'do-core-upgrade' === $action || 'do-core-reinstall' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</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"> wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -811,7 +811,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"> require_once ABSPATH . 'wp-admin/admin-header.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'do-core-reinstall' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'do-core-reinstall' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $reinstall = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $reinstall = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,7 +831,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-footer.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">-} elseif ( 'do-plugin-upgrade' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'do-plugin-upgrade' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -869,7 +869,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-footer.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">-} elseif ( 'do-theme-upgrade' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'do-theme-upgrade' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,7 +909,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-footer.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">-} elseif ( 'do-translation-upgrade' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( 'do-translation-upgrade' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_languages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/update.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/update.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme = isset( $_REQUEST['theme'] ) ? urldecode( $_REQUEST['theme'] ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $action = isset( $_REQUEST['action'] ) ? $_REQUEST['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 ( 'update-selected' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'update-selected' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,7 +50,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> iframe_footer();
</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 ( 'upgrade-plugin' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upgrade-plugin' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,7 +72,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/admin-footer.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">- } elseif ( 'activate-plugin' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'activate-plugin' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update plugins for this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,7 +98,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include WP_PLUGIN_DIR . '/' . $plugin;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> iframe_footer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'install-plugin' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'install-plugin' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'install_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
</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"> require_once ABSPATH . 'wp-admin/admin-footer.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">- } elseif ( 'upload-plugin' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upload-plugin' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'upload_plugins' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to install plugins on this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,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-footer.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">- } elseif ( 'upgrade-theme' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upgrade-theme' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader->upgrade( $theme );
</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-footer.php';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'update-selected-themes' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'update-selected-themes' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'update_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to update themes for this site.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -220,7 +220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $upgrader->bulk_upgrade( $themes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> iframe_footer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'install-theme' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'install-theme' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'install_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,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-footer.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">- } elseif ( 'upload-theme' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'upload-theme' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'upload_themes' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to install themes on this site.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/upload.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> if ( $doaction ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-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 ( 'delete_all' == $doaction ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete_all' === $doaction ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
</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['media'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminusereditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-edit.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/user-edit.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,7 +204,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( isset( $_GET['error'] ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'new-email' == $_GET['error'] ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'new-email' === $_GET['error'] ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-admin/user-new.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
</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( $_REQUEST['action'] ) && 'adduser' == $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['action'] ) && 'adduser' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'add-user', '_wpnonce_add-user' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_details = null;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( $redirect );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( isset( $_REQUEST['action'] ) && 'createuser' == $_REQUEST['action'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( isset( $_REQUEST['action'] ) && 'createuser' === $_REQUEST['action'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'create-user', '_wpnonce_create-user' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'create_users' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -331,7 +331,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"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'add' == $_GET['update'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'add' === $_GET['update'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $messages[] = __( 'User added.' );
</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="trunksrcwpcontentthemestwentyelevencontentfeaturedphp"></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/content-featured.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-featured.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/content-featured.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,9 +32,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-meta">
</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">- /* translators: Used between list items, there is a space after the comma. */
- $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
- if ( '' != $tag_list ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Used between list items, there is a space after the comma. */
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+
+ if ( '' !== $tag_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Category list, 2: Tag list, 3: Post permalink, 4: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $utility_text = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,16 +42,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Category list, 3: Post permalink, 4: Post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $utility_text = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- $utility_text,
- /* translators: Used between list items, there is a space after the comma. */
- get_the_category_list( __( ', ', 'twentyeleven' ) ),
- $tag_list,
- esc_url( get_permalink() ),
- the_title_attribute( 'echo=0' )
- );
- ?>
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ $utility_text,
+ /* translators: Used between list items, there is a space after the comma. */
+ get_the_category_list( __( ', ', 'twentyeleven' ) ),
+ $tag_list,
+ esc_url( get_permalink() ),
+ the_title_attribute( 'echo=0' )
+ );
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </footer><!-- .entry-meta -->
</span><span class="cx" style="display: block; padding: 0 10px"> </article><!-- #post-<?php the_ID(); ?> -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentsinglephp"></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/content-single.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content-single.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/content-single.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12,7 +12,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><span class="cx" style="display: block; padding: 0 10px"> <h1 class="entry-title"><?php the_title(); ?></h1>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'post' == get_post_type() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === get_post_type() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyeleven_posted_on(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,15 +33,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-meta">
</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">- /* translators: Used between list items, there is a space after the comma. */
- $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Used between list items, there is a space after the comma. */
+ $categories_list = get_the_category_list( __( ', ', 'twentyeleven' ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Used between list items, there is a space after the comma. */
- $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
- if ( '' != $tag_list ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Used between list items, there is a space after the comma. */
+ $tag_list = get_the_tag_list( '', __( ', ', 'twentyeleven' ) );
+
+ if ( '' !== $tag_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Categories list, 2: Tag list, 3: Permalink, 4: Post title, 5: Author name, 6: Author URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> $utility_text = __( 'This entry was posted in %1$s and tagged %2$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $categories_list ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' !== $categories_list ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Categories list, 2: Tag list, 3: Permalink, 4: Post title, 5: Author name, 6: Author URL. */
</span><span class="cx" style="display: block; padding: 0 10px"> $utility_text = __( 'This entry was posted in %1$s by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,16 +50,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $utility_text = __( 'This entry was posted by <a href="%6$s">%5$s</a>. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyeleven' );
</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">- printf(
- $utility_text,
- $categories_list,
- $tag_list,
- esc_url( get_permalink() ),
- the_title_attribute( 'echo=0' ),
- get_the_author(),
- esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
- );
- ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ $utility_text,
+ $categories_list,
+ $tag_list,
+ esc_url( get_permalink() ),
+ the_title_attribute( 'echo=0' ),
+ get_the_author(),
+ esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) )
+ );
+ ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php edit_post_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevencontentphp"></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/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/content.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/content.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> <h1 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h1>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'post' == get_post_type() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === get_post_type() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyeleven_posted_on(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_theme_support( 'post-formats', array( 'aside', 'link', 'gallery', 'status', 'quote', 'image' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_options = twentyeleven_get_theme_options();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'dark' == $theme_options['color_scheme'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dark' === $theme_options['color_scheme'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_background_color = '1d1d1d';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_background_color = 'e2e2e2';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <style type="text/css" id="twentyeleven-header-css">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Has the text been hidden?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'blank' == $text_color ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blank' === $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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -719,28 +719,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="comment-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</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">- $avatar_size = 68;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $avatar_size = 68;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '0' != $comment->comment_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $avatar_size = 39;
</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 get_avatar( $comment, $avatar_size );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo get_avatar( $comment, $avatar_size );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf(
- /* translators: 1: Comment author, 2: Date and time. */
- __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
- sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
- sprintf(
- '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
- esc_url( get_comment_link( $comment->comment_ID ) ),
- get_comment_time( 'c' ),
- /* translators: 1: Date, 2: Time. */
- sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
- )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf(
+ /* translators: 1: Comment author, 2: Date and time. */
+ __( '%1$s on %2$s <span class="says">said:</span>', 'twentyeleven' ),
+ sprintf( '<span class="fn">%s</span>', get_comment_author_link() ),
+ sprintf(
+ '<a href="%1$s"><time datetime="%2$s">%3$s</time></a>',
+ esc_url( get_comment_link( $comment->comment_ID ) ),
+ get_comment_time( 'c' ),
+ /* translators: 1: Date, 2: Time. */
+ sprintf( __( '%1$s at %2$s', 'twentyeleven' ), get_comment_date(), get_comment_time() )
+ )
+ );
</ins><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">- <?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php edit_comment_link( __( 'Edit', 'twentyeleven' ), '<span class="edit-link">', '</span>' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .comment-author .vcard -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenheaderphp"></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/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/header.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,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"> // Has the text been hidden?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'blank' == get_header_textcolor() ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blank' === get_header_textcolor() ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> $header_image_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $header_image ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_class = ' with-image';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincthemeoptionsphp"></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/inc/theme-options.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $options = twentyeleven_get_theme_options();
</span><span class="cx" style="display: block; padding: 0 10px"> $color_scheme = $options['color_scheme'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'dark' == $color_scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'dark' === $color_scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'dark', get_template_directory_uri() . '/colors/dark.css', array(), '20190404' );
</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">@@ -499,9 +499,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'one-column' );
</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 ( 'content-sidebar' == $current_layout ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'content-sidebar' === $current_layout ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'right-sidebar';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'sidebar-content' == $current_layout ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'sidebar-content' === $current_layout ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'left-sidebar';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = $current_layout;
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenincwidgetsphp"></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/inc/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/inc/widgets.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -111,7 +111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera->the_post();
</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">- <?php if ( 'link' != get_post_format() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'link' !== get_post_format() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <li class="widget-entry-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_permalink() ); ?>" rel="bookmark"><?php the_title(); ?></a>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyelevenshowcasephp"></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/showcase.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/showcase.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/showcase.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> * We are using a heading by rendering the_content
</span><span class="cx" style="display: block; padding: 0 10px"> * If we have content for this page, let's display it.
</span><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_the_content() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== get_the_content() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> get_template_part( 'content', 'intro' );
</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="trunksrcwpcontentthemestwentyelevensidebarphp"></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/sidebar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/sidebar.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyeleven/sidebar.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,7 +10,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = twentyeleven_get_theme_options();
</span><span class="cx" style="display: block; padding: 0 10px"> $current_layout = $options['theme_layout'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( 'content' != $current_layout ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( 'content' !== $current_layout ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="secondary" class="widget-area" role="complementary">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( ! dynamic_sidebar( 'sidebar-1' ) ) : ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteencontentsearchphp"></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/twentyfifteen/content-search.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/content-search.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfifteen/content-search.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,7 +21,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php the_excerpt(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-summary -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'post' == get_post_type() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'post' === get_post_type() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <footer class="entry-footer">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfifteen_entry_meta(); ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfifteenfunctionsphp"></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/twentyfifteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/functions.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfifteen/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,13 +320,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'cyrillic' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cyrillic' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',cyrillic,cyrillic-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'greek' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'greek' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',greek,greek-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'devanagari' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'devanagari' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',devanagari';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'vietnamese' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'vietnamese' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',vietnamese';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -460,7 +460,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $next = get_adjacent_post( false, '', false );
</span><span class="cx" style="display: block; padding: 0 10px"> $css = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_attachment() && 'attachment' == $previous->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_attachment() && 'attachment' === $previous->post_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +498,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Menu item with possible description.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'primary' == $args->theme_location && $item->description ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'primary' === $args->theme_location && $item->description ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_output = str_replace( $args->link_after . '</a>', '<div class="menu-item-description">' . $item->description . '</div>' . $args->link_after . '</a>', $item_output );
</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="trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp"></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/twentyfifteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == get_post_type() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_singular() || is_multi_author() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp"></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/content-featured-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> // Output the featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_post_thumbnail() ) :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'grid' == get_theme_mod( 'featured_content_layout' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'grid' === get_theme_mod( 'featured_content_layout' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> the_post_thumbnail( 'twentyfourteen-full-width' );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentphp"></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/content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</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">- if ( 'post' == get_post_type() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentyfourteen_posted_on();
</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="trunksrcwpcontentthemestwentyfourteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/functions.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> wp_enqueue_script( 'jquery-masonry' );
</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_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_front_page() && 'slider' === get_theme_mod( 'featured_content_layout' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyfourteen-slider', get_template_directory_uri() . '/js/slider.js', array( 'jquery' ), '20150120', true );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_localize_script(
</span><span class="cx" style="display: block; padding: 0 10px"> 'twentyfourteen-slider',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,7 +567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'singular';
</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_front_page() && 'slider' == get_theme_mod( 'featured_content_layout' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_front_page() && 'slider' === get_theme_mod( 'featured_content_layout' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'slider';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_front_page() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'grid';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp"></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/featured-content.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail if term objects are unavailable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all' != $args['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $args['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</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">@@ -339,7 +339,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"> // Make sure we are in the correct taxonomy.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_tag' != $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' !== $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</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">@@ -466,7 +466,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options = wp_parse_args( $saved, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> $options = array_intersect_key( $options, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all' != $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return isset( $options[ $key ] ) ? $options[ $key ] : 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="trunksrcwpcontentthemestwentynineteenclassesclasstwentynineteensvgiconsphp"></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/twentynineteen/classes/class-twentynineteen-svg-icons.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentynineteen/classes/class-twentynineteen-svg-icons.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,9 +25,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets the SVG code for a given icon.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_svg( $group, $icon, $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ui' == $group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ui' === $group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $arr = self::$ui_icons;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'social' == $group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'social' === $group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $arr = self::$social_icons;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $arr = array();
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytenloopphp"></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/twentyten/loop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/loop.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentyten/loop.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -62,7 +62,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* How to display posts of the Gallery format. The gallery category is the old way. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ( function_exists( 'get_post_format' ) && 'gallery' === get_post_format( $post->ID ) ) || in_category( _x( 'gallery', 'gallery category slug', 'twentyten' ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="entry-title"><a href="<?php the_permalink(); ?>" rel="bookmark"><?php the_title(); ?></a></h2>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-utility">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $gallery = get_term_by( 'slug', _x( 'gallery', 'gallery category slug', 'twentyten' ), 'category' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( function_exists( 'get_post_format' ) && 'gallery' == get_post_format( $post->ID ) ) :
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( function_exists( 'get_post_format' ) && 'gallery' === get_post_format( $post->ID ) ) :
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <a href="<?php echo esc_url( get_post_format_link( 'gallery' ) ); ?>" title="<?php esc_attr_e( 'View Galleries', 'twentyten' ); ?>"><?php _e( 'More Galleries', 'twentyten' ); ?></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="meta-sep">|</span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php /* How to display posts of the Aside format. The asides category is the old way. */ ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' == get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php elseif ( ( function_exists( 'get_post_format' ) && 'aside' === get_post_format( $post->ID ) ) || in_category( _x( 'asides', 'asides category slug', 'twentyten' ) ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_archive() || is_search() ) : // Display excerpts for archives and search. ?>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentythirteen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/functions.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentythirteen/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="featured-post">' . esc_html__( 'Sticky', 'twentythirteen' ) . '</span>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! has_post_format( 'link' ) && 'post' == get_post_type() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! has_post_format( 'link' ) && 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentythirteen_entry_date();
</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">@@ -495,7 +495,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 author.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == get_post_type() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === get_post_type() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<span class="author vcard"><a class="url fn n" href="%1$s" title="%2$s" rel="author">%3$s</a></span>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentythirteenjsthemecustomizerjs"></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/js/theme-customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentythirteen/js/theme-customizer.js 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,8 +20,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Header text color.
</span><span class="cx" style="display: block; padding: 0 10px"> wp.customize( 'header_textcolor', function( value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> value.bind( function( to ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'blank' == to ) {
- if ( 'remove-header' == wp.customize.instance( 'header_image' ).get() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blank' === to ) {
+ if ( 'remove-header' === wp.customize.instance( 'header_image' ).get() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $( '.home-link' ).css( 'min-height', '0' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $( '.site-title, .site-description' ).css( {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvefunctionsphp"></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/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/functions.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,11 +158,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'cyrillic' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'cyrillic' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',cyrillic,cyrillic-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'greek' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'greek' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',greek,greek-ext';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'vietnamese' == $subset ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'vietnamese' === $subset ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subsets .= ',vietnamese';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwelvejsthemecustomizerjs"></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/js/theme-customizer.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-content/themes/twentytwelve/js/theme-customizer.js 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,9 +41,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> value.bind( function( to ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var body = $( 'body' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( '#ffffff' == to || '#fff' == to ) && 'none' == body.css( 'background-image' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( '#ffffff' === to || '#fff' === to ) && 'none' === body.css( 'background-image' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> body.addClass( 'custom-background-white' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else if ( '' == to && 'none' == body.css( 'background-image' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ else if ( '' === to && 'none' === body.css( 'background-image' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> body.addClass( 'custom-background-empty' );
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> body.removeClass( 'custom-background-empty custom-background-white' );
</span></span></pre></div>
<a id="trunksrcwpincludesadminbarphp"></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/admin-bar.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/admin-bar.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/admin-bar.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -701,19 +701,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $current_screen = get_current_screen();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $current_screen->base ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'post' === $current_screen->base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $post->post_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'edit' == $current_screen->base ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'edit' === $current_screen->base ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $current_screen->post_type );
</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' == $current_screen->base
- && 'add' != $current_screen->action
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $current_screen->base
+ && 'add' !== $current_screen->action
</ins><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object )
</span><span class="cx" style="display: block; padding: 0 10px"> && current_user_can( 'read_post', $post->ID )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->public )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->show_in_admin_bar ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'draft' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'draft' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $preview_link = get_preview_post_link( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_node(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,7 +733,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">- } elseif ( 'edit' == $current_screen->base
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'edit' === $current_screen->base
</ins><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->public )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( $post_type_object->show_in_admin_bar )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -745,7 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'href' => get_post_type_archive_link( $current_screen->post_type ),
</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">- } elseif ( 'term' == $current_screen->base && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'term' === $current_screen->base && isset( $tag ) && is_object( $tag ) && ! is_wp_error( $tag ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tax = get_taxonomy( $tag->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_taxonomy_viewable( $tax ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_admin_bar->add_node(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,7 +757,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">- } elseif ( 'user-edit' == $current_screen->base && isset( $user_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'user-edit' === $current_screen->base && isset( $user_id ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_object = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $view_link = get_author_posts_url( $user_object->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_object->exists() && $view_link ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1204,7 +1205,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 ( ! isset( $show_admin_bar ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_user_logged_in() || 'wp-login.php' == $pagenow ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_user_logged_in() || 'wp-login.php' === $pagenow ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $show_admin_bar = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $show_admin_bar = _get_admin_bar_pref();
</span></span></pre></div>
<a id="trunksrcwpincludesauthortemplatephp"></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/author-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/author-template.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/author-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,7 +349,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $file = home_url( '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $file . '?author=' . $auth_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $author_nicename ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $author_nicename ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $author_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $user->user_nicename ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_nicename = $user->user_nicename;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,7 +467,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> continue; // No need to go further to process HTML.
</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 ( 'list' == $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return .= '<li>';
</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">@@ -513,7 +513,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"> $return .= $link;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return .= ( 'list' == $args['style'] ) ? '</li>' : ', ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return .= ( 'list' === $args['style'] ) ? '</li>' : ', ';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $return = rtrim( $return, ', ' );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/bookmark-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $desc;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['show_updated'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '00' != substr( $bookmark->link_updated_f, 0, 2 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '00' !== substr( $bookmark->link_updated_f, 0, 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title .= ' (';
</span><span class="cx" style="display: block; padding: 0 10px"> $title .= sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Date and time of last update. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,15 +98,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $alt = ' alt="' . $name . ( $parsed_args['show_description'] ? ' ' . $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 ( '' != $title ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $title ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = ' title="' . $title . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = $bookmark->link_rel;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $rel ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $rel ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $rel = ' rel="' . esc_attr( $rel ) . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $target = $bookmark->link_target;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $target ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $target ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $target = ' target="' . $target . '"';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<a href="' . $the_link . '"' . $rel . $title . $target . '>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '</em>';
</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['show_description'] && '' != $desc ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['show_description'] && '' !== $desc ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $parsed_args['between'] . $desc;
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/bookmark.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,20 +418,20 @@
</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 ( 'raw' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'raw' === $context ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "edit_{$field}", $value, $bookmark_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'link_notes' == $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'link_notes' === $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_html( $value ); // textarea_escaped
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $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">- } elseif ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "pre_{$field}", $value );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,9 +438,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "{$field}", $value, $bookmark_id, $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attribute' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attribute' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'js' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'js' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_js( $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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/capabilities.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> case 'edit_user':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'edit_users':
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow user to edit themselves.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit_user' === $cap && isset( $args[0] ) && $user_id == $args[0] ) {
</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">@@ -73,7 +73,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 ( 'revision' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'revision' === $post->post_type ) {
</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">@@ -94,7 +94,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post_type->map_meta_cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->$cap;
</span><span class="cx" style="display: block; padding: 0 10px"> // Prior to 3.1 we would re-call map_meta_cap here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'delete_post' == $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'delete_post' === $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = $post_type->cap->$cap;
</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">@@ -105,7 +105,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the post is published or scheduled...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->delete_published_posts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'trash' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->delete_published_posts;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The post is published or scheduled, extra cap required.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->delete_published_posts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'private' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->delete_private_posts;
</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">@@ -146,7 +146,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 ( 'revision' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'revision' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post->post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</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"> if ( ! $post_type->map_meta_cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->$cap;
</span><span class="cx" style="display: block; padding: 0 10px"> // Prior to 3.1 we would re-call map_meta_cap here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit_post' == $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit_post' === $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = $post_type->cap->$cap;
</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">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the post is published or scheduled...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->edit_published_posts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'trash' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->edit_published_posts;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // The post is published or scheduled, extra cap required.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->edit_published_posts;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'private' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->edit_private_posts;
</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">@@ -215,7 +215,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 ( 'revision' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'revision' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post->post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = 'do_not_allow';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -234,7 +234,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post_type->map_meta_cap ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $caps[] = $post_type->cap->$cap;
</span><span class="cx" style="display: block; padding: 0 10px"> // Prior to 3.1 we would re-call map_meta_cap here.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'read_post' == $cap ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'read_post' === $cap ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cap = $post_type->cap->$cap;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/category-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $thelist = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $separator ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $separator ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thelist .= '<ul class="post-categories">';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $categories as $category ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thelist .= "\n\t<li>";
</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"> $defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['type'] ) && 'link' === $args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,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 ( ! isset( $parsed_args['class'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['class'] = ( 'category' == $parsed_args['taxonomy'] ) ? 'categories' : $parsed_args['taxonomy'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['class'] = ( 'category' === $parsed_args['taxonomy'] ) ? 'categories' : $parsed_args['taxonomy'];
</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 ( ! taxonomy_exists( $parsed_args['taxonomy'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,12 +572,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = get_categories( $parsed_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parsed_args['title_li'] && 'list' == $parsed_args['style'] && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $parsed_args['title_li'] && 'list' === $parsed_args['style']
+ && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = '<li class="' . esc_attr( $parsed_args['class'] ) . '">' . $parsed_args['title_li'] . '<ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $categories ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $show_option_none ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' == $parsed_args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $parsed_args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '<li class="cat-item-none">' . $show_option_none . '</li>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= $show_option_none;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fallback for the 'All' link is the posts page.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $posts_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == get_option( 'show_on_front' ) && 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' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_page = get_permalink( get_option( 'page_for_posts' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_page = home_url( '/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -612,7 +616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_page = esc_url( $posts_page );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' == $parsed_args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $parsed_args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "<li class='cat-item-all'><a href='$posts_page'>$show_option_all</a></li>";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<a href='$posts_page'>$show_option_all</a>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,7 +638,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= walk_category_tree( $categories, $depth, $parsed_args );
</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['title_li'] && 'list' == $parsed_args['style'] && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parsed_args['title_li'] && 'list' === $parsed_args['style']
+ && ( ! empty( $categories ) || ! $parsed_args['hide_title_if_empty'] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= '</ul></li>';
</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">@@ -713,7 +719,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 ( $tags as $key => $tag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit' == $args['link'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $args['link'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
</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( intval( $tag->term_id ), $tag->taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +746,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $return = apply_filters( 'wp_tag_cloud', $return, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'array' == $args['format'] || empty( $args['echo'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'array' === $args['format'] || empty( $args['echo'] ) ) {
</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">@@ -939,8 +945,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tags_data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $tag_id,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'url' => '#' != $tag->link ? $tag->link : '#',
- 'role' => '#' != $tag->link ? '' : ' role="button"',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'url' => ( '#' !== $tag->link ) ? $tag->link : '#',
+ 'role' => ( '#' !== $tag->link ) ? '' : ' role="button"',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => $tag->name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'formatted_count' => $formatted_count,
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => $tag->slug,
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/category.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['taxonomy'] = apply_filters( 'get_categories_taxonomy', $args['taxonomy'], $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['type'] ) && 'link' === $args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,9 +126,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $leaf_path = sanitize_title( basename( $category_paths ) );
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><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="cx" style="display: block; padding: 0 10px"> 'taxonomy' => 'category',
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-http.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $args = wp_parse_args( $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // By default, HEAD requests do not cause redirections.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['method'] ) && 'HEAD' == $args['method'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['method'] ) && 'HEAD' === $args['method'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $defaults['redirection'] = 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">@@ -739,7 +739,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $newheaders[ $key ] = $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 ( 'set-cookie' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'set-cookie' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cookies[] = new WP_Http_Cookie( $value, $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">@@ -870,7 +870,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $home = parse_url( get_option( 'siteurl' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't block requests back to ourselves by default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'localhost' === $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to block local HTTP API requests.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -975,7 +975,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's a root-relative path, then great.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $relative_url_parts['path'] ) && '/' === $relative_url_parts['path'][0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = $relative_url_parts['path'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Else it's a relative path.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1040,7 +1040,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // POST requests should not POST to a redirected location.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'POST' == $args['method'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'POST' === $args['method'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $response['response']['code'], array( 302, 303 ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['method'] = 'GET';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswalkercategoryphp"></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-category.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-category.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-walker-category.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * value is 'list'. See wp_list_categories(). Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function start_lvl( &$output, $depth = 0, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' != $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' !== $args['style'] ) {
</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">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * value is 'list'. See wp_list_categories(). Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function end_lvl( &$output, $depth = 0, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' != $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' !== $args['style'] ) {
</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">@@ -186,7 +186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['show_count'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link .= ' (' . number_format_i18n( $category->count ) . ')';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' == $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' === $args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "\t<li";
</span><span class="cx" style="display: block; padding: 0 10px"> $css_classes = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'cat-item',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * to output. See wp_list_categories(). Default empty array.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function end_el( &$output, $page, $depth = 0, $args = array() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'list' != $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'list' !== $args['style'] ) {
</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="trunksrcwpincludesclasswalkercommentphp"></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-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-walker-comment.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-walker-comment.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,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 ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'pingback' === $comment->comment_type || 'trackback' === $comment->comment_type ) && $args['short_ping'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->ping( $comment, $depth, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= ob_get_clean();
</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"> $output .= ob_get_clean();
</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 ( 'div' == $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'div' === $args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "</div><!-- #comment-## -->\n";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "</li><!-- #comment-## -->\n";
</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"> * @param array $args An array of arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function ping( $comment, $depth, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( '', $comment ); ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-body">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +256,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args An array of arguments.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function comment( $comment, $depth, $args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'div' == $args['style'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'div' === $args['style'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag = 'div';
</span><span class="cx" style="display: block; padding: 0 10px"> $add_below = 'comment';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -273,7 +273,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"> <<?php echo $tag; ?> <?php comment_class( $this->has_children ? 'parent' : '', $comment ); ?> id="comment-<?php comment_ID(); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( 'div' != $args['style'] ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'div' !== $args['style'] ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="comment-author vcard">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,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">- <?php if ( 'div' != $args['style'] ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( 'div' !== $args['style'] ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-walker-page.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +201,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( $args['show_date'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'modified' == $args['show_date'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'modified' === $args['show_date'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $time = $page->post_modified;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $time = $page->post_date;
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -388,7 +388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The expected return type from this filter depends on the value passed in the request query_vars.
</span><span class="cx" style="display: block; padding: 0 10px"> * When `$this->query_vars['count']` is set, the filter should return the comment count as an int.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When `'ids' == $this->query_vars['fields']`, the filter should return an array of comment ids.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When `'ids' === $this->query_vars['fields']`, the filter should return an array of comment ids.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Otherwise the filter should return an array of WP_Comment objects.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.3.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = array_map( 'intval', $comment_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ids' == $this->query_vars['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ids' === $this->query_vars['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->comments = $comment_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->comments;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,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">- $order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $order = ( 'ASC' === strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Disable ORDER BY with 'none', an empty array, or boolean false.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $suppress_page_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === $page && 'page' === $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Insert Front Page or custom "Home" link.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $front_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $front_page_obj = get_post( $front_page );
</span><span class="cx" style="display: block; padding: 0 10px"> $important_pages[] = $front_page_obj;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,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"> // Insert Posts Page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $posts_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $posts_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_for_posts' ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $posts_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $posts_page_obj = get_post( $posts_page );
</span><span class="cx" style="display: block; padding: 0 10px"> $important_pages[] = $posts_page_obj;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add "Home" link if search term matches. Treat as a page, but switch to custom on add.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['s'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only insert custom "Home" link if there's no Front Page
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $front_page = 'page' == get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $front_page = 'page' === get_option( 'show_on_front' ) ? (int) get_option( 'page_on_front' ) : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $front_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $title = _x( 'Home', 'nav menu home label' );
</span><span class="cx" style="display: block; padding: 0 10px"> $matches = function_exists( 'mb_stripos' ) ? false !== mb_stripos( $title, $args['s'] ) : false !== stripos( $title, $args['s'] );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-editor.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $strings .= @file_get_contents( $path . $mce_locale . '_dlg.js' ) . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'en' != $mce_locale && empty( $strings ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'en' !== $mce_locale && empty( $strings ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( @is_file( $path . 'en.js' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $str1 = @file_get_contents( $path . 'en.js' );
</span><span class="cx" style="display: block; padding: 0 10px"> $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -834,8 +834,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $options .= $key . ':' . $val . ',';
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $value ) && is_string( $value ) && (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( '{' == $value[0] && '}' == $value[ strlen( $value ) - 1 ] ) ||
- ( '[' == $value[0] && ']' == $value[ strlen( $value ) - 1 ] ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( '{' === $value[0] && '}' === $value[ strlen( $value ) - 1 ] ) ||
+ ( '[' === $value[0] && ']' === $value[ strlen( $value ) - 1 ] ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> preg_match( '/^\(?function ?\(/', $value ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $options .= $key . ':' . $value . ',';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1776,7 +1776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Build results.
</span><span class="cx" style="display: block; padding: 0 10px"> $results = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $info = mysql2date( __( 'Y/m/d' ), $post->post_date );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $info = $pts[ $post->post_type ]->labels->singular_name;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpembedphp"></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-embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-embed.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-embed.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,7 +355,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 ( $post_metas as $post_meta_key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '_oembed_' == substr( $post_meta_key, 0, 8 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '_oembed_' === substr( $post_meta_key, 0, 8 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_ID, $post_meta_key );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcookiephp"></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-cookie.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-cookie.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-http-cookie.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->domain = $arrURL['host'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->path = isset( $arrURL['path'] ) ? $arrURL['path'] : '/';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/' != substr( $this->path, -1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' !== substr( $this->path, -1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->path = dirname( $this->path ) . '/';
</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">@@ -127,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> list( $key, $val ) = strpos( $pair, '=' ) ? explode( '=', $pair ) : array( $pair, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = strtolower( trim( $key ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'expires' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'expires' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $val = strtotime( $val );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->$key = $val;
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get details on the URL we're thinking about sending to.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = parse_url( $url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' == $url['scheme'] ? 443 : 80 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url['port'] = isset( $url['port'] ) ? $url['port'] : ( 'https' === $url['scheme'] ? 443 : 80 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $url['path'] = isset( $url['path'] ) ? $url['path'] : '/';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Values to use for comparison against the URL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -186,7 +186,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"> // Host - very basic check that the request URL ends with the domain restriction (minus leading dot).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $domain = substr( $domain, 0, 1 ) == '.' ? substr( $domain, 1 ) : $domain;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $domain = ( '.' === substr( $domain, 0, 1 ) ) ? substr( $domain, 1 ) : $domain;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $url['host'], -strlen( $domain ) ) != $domain ) {
</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="trunksrcwpincludesclasswphttpencodingphp"></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-encoding.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-encoding.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-http-encoding.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> public static function compatible_gzinflate( $gzData ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Compressed data might contain a full header, if so strip it for gzinflate().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $gzData, 0, 3 ) == "\x1f\x8b\x08" ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( "\x1f\x8b\x08" === substr( $gzData, 0, 3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $i = 10;
</span><span class="cx" style="display: block; padding: 0 10px"> $flg = ord( substr( $gzData, 3, 1 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $flg > 0 ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> * to ::1, which fails when the server is not set up for it. For compatibility, always
</span><span class="cx" style="display: block; padding: 0 10px"> * connect to the IPv4 address.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'localhost' == strtolower( $connect_host ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'localhost' === strtolower( $connect_host ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $connect_host = '127.0.0.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">@@ -186,8 +186,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $include_port_in_host_header = (
</span><span class="cx" style="display: block; padding: 0 10px"> ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( 'http' == $arrURL['scheme'] && 80 != $arrURL['port'] ) ||
- ( 'https' == $arrURL['scheme'] && 443 != $arrURL['port'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( 'http' === $arrURL['scheme'] && 80 != $arrURL['port'] ) ||
+ ( 'https' === $arrURL['scheme'] && 443 != $arrURL['port'] )
</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 ( $include_port_in_host_header ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,7 +334,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"> // If the body was chunk encoded, then decode it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] ) && 'chunked' == $arrHeaders['headers']['transfer-encoding'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $process['body'] ) && isset( $arrHeaders['headers']['transfer-encoding'] )
+ && 'chunked' === $arrHeaders['headers']['transfer-encoding']
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $process['body'] = WP_Http::chunkTransferDecode( $process['body'] );
</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">@@ -405,7 +407,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"> // IP's can't be wildcards, Stop processing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ip' == $host_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ip' === $host_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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,7 +240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $quality = apply_filters( 'wp_editor_set_quality', $this->default_quality, $this->mime_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 ( 'image/jpeg' == $this->mime_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'image/jpeg' === $this->mime_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the JPEG compression quality for backward-compatibility.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplistutilphp"></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-list-util.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-list-util.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-list-util.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,9 +112,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"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( 'AND' == $operator && $matched == $count ) ||
- ( 'OR' == $operator && $matched > 0 ) ||
- ( 'NOT' == $operator && 0 == $matched )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( 'AND' === $operator && $matched == $count ) ||
+ ( 'OR' === $operator && $matched > 0 ) ||
+ ( 'NOT' === $operator && 0 == $matched )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered[ $key ] = $obj;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswplocalephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-locale.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-locale.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-locale.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -214,7 +214,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = $GLOBALS['text_direction'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 'rtl' or 'ltr'. This sets the text direction for WordPress. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'rtl' == _x( 'ltr', 'text direction' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'rtl' === _x( 'ltr', 'text direction' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->text_direction = 'rtl';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether locale is RTL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_rtl() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'rtl' == $this->text_direction;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'rtl' === $this->text_direction;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpmetaqueryphp"></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-meta-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-meta-query.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-meta-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,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 ( isset( $meta_query['relation'] ) && strtoupper( $meta_query['relation'] ) == 'OR' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $meta_query['relation'] ) && 'OR' === strtoupper( $meta_query['relation'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->relation = 'OR';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->relation = 'AND';
</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"> return 'CHAR';
</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 ( 'NUMERIC' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'NUMERIC' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_type = 'SIGNED';
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-network-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -262,7 +262,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $network_ids = array_map( 'intval', $network_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ids' == $this->query_vars['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ids' === $this->query_vars['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->networks = $network_ids;
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->networks;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpoembedphp"></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-oembed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-oembed.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-oembed.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -487,7 +487,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $providers[ $linktypes[ $atts['type'] ] ] = htmlspecialchars_decode( $atts['href'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Stop here if it's JSON (that's all we need).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'json' == $linktypes[ $atts['type'] ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'json' === $linktypes[ $atts['type'] ] ) {
</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">@@ -537,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'json', 'xml' ) as $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $this->_fetch_with_format( $provider, $format );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $result ) && 'not-implemented' === $result->get_error_code() ) {
</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"> return ( $result && ! is_wp_error( $result ) ) ? $result : false;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpposttypephp"></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-post-type.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-post-type.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-post-type.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> }
</span><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 !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $args['rewrite'] && ( is_admin() || get_option( 'permalink_structure' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $args['rewrite'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args['rewrite'] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -554,7 +554,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp->add_query_var( $this->query_var );
</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 !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $this->rewrite && ( is_admin() || get_option( 'permalink_structure' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->hierarchical ) {
</span><span class="cx" style="display: block; padding: 0 10px"> add_rewrite_tag( "%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,14 +804,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['attachment_id'] = absint( $qv['attachment_id'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( '' != $qv['attachment'] ) || ! empty( $qv['attachment_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( '' !== $qv['attachment'] ) || ! empty( $qv['attachment_id'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_attachment = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $qv['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' !== $qv['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $qv['p'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_single = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $qv['pagename'] || ! empty( $qv['page_id'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' !== $qv['pagename'] || ! empty( $qv['page_id'] ) ) {
</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_single = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> }
</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['w'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $qv['w'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_date = 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">@@ -891,7 +891,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 ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $tax_query['operator'] ) && 'NOT IN' !== $tax_query['operator'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $tax_query['taxonomy'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'category':
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_category = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -912,7 +912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_author = 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['author_name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $qv['author_name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_author = 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">@@ -971,10 +971,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"> // Correct `is_*` for 'page_on_front' and 'page_for_posts'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->is_home && '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 && 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_query = wp_parse_args( $this->query );
</span><span class="cx" style="display: block; padding: 0 10px"> // 'pagename' can be set and empty depending on matched rewrite rules. Ignore an empty 'pagename'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_query['pagename'] ) && '' == $_query['pagename'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_query['pagename'] ) && '' === $_query['pagename'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $_query['pagename'] );
</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">@@ -992,10 +992,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $qv['pagename'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $qv['pagename'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->queried_object = get_page_by_path( $qv['pagename'] );
</span><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->queried_object && 'attachment' == $this->queried_object->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->queried_object && 'attachment' === $this->queried_object->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^[^%]*%(?:postname)%/', get_option( 'permalink_structure' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // See if we also have a post with the same slug.
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1103,7 +1103,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 ( get_taxonomies( array(), 'objects' ) as $taxonomy => $t ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_tag' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue; // Handled further down in the $q['tag'] block.
</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">@@ -1235,7 +1235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Tag 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 ( '' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $q['tag'], ',' ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tags as $tag ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1993,7 +1993,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 we've got a post_type AND it's not "any" post_type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $q['post_type'] ) && 'any' != $q['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $q['post_type'] ) && 'any' !== $q['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $q['post_type'] as $_post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype_obj = get_post_type_object( $_post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ptype_obj || ! $ptype_obj->query_var || empty( $q[ $ptype_obj->query_var ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2020,14 +2020,14 @@
</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"> // Parameters related to 'post_name'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $q['name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $q['name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = sanitize_title_for_query( $q['name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '' != $q['pagename'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' !== $q['pagename'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->queried_object_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $reqpage = $this->queried_object_id;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' != $q['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' !== $q['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $q['post_type'] as $_post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype_obj = get_post_type_object( $_post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ptype_obj || ! $ptype_obj->hierarchical ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2051,12 +2051,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"> $page_for_posts = get_option( 'page_for_posts' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'page' != get_option( 'show_on_front' ) ) || empty( $page_for_posts ) || ( $reqpage != $page_for_posts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'page' !== get_option( 'show_on_front' ) ) || empty( $page_for_posts ) || ( $reqpage != $page_for_posts ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = $q['pagename'];
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND ({$wpdb->posts}.ID = '$reqpage')";
</span><span class="cx" style="display: block; padding: 0 10px"> $reqpage_obj = get_post( $reqpage );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_object( $reqpage_obj ) && 'attachment' == $reqpage_obj->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $reqpage_obj ) && 'attachment' === $reqpage_obj->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_attachment = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'attachment';
</span><span class="cx" style="display: block; padding: 0 10px"> $q['post_type'] = 'attachment';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2064,7 +2064,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['attachment_id'] = $reqpage;
</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">- } elseif ( '' != $q['attachment'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '' !== $q['attachment'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $q['name'] = $q['attachment'];
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2239,7 +2239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Author stuff for nice URLs.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $q['author_name'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $q['author_name'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $q['author_name'], '/' ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['author_name'] = explode( '/', $q['author_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2285,7 +2285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // MIME-Type stuff for attachment browsing.
</span><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['post_mime_type'] ) && '' != $q['post_mime_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['post_mime_type'] ) && '' !== $q['post_mime_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $search . $whichauthor . $whichmimetype;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2320,7 +2320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "{$wpdb->posts}.post_date " . $q['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">- } elseif ( 'none' == $q['orderby'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'none' === $q['orderby'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby_array = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2413,7 +2413,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= $wpdb->prepare( " AND {$wpdb->posts}.ping_status = %s ", $q['ping_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 ( 'any' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'any' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $in_search_post_types = get_post_types( array( 'exclude_from_search' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $in_search_post_types ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $where .= ' AND 1=0 ';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2468,7 +2468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati() as $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $status, $q_status, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'private' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'private' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $p_status[] = "{$wpdb->posts}.post_status = '$status'";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $r_status[] = "{$wpdb->posts}.post_status = '$status'";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2477,7 +2477,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( $q['perm'] ) || 'readable' != $q['perm'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $q['perm'] ) || 'readable' !== $q['perm'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $r_status = array_merge( $r_status, $p_status );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $p_status );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2486,7 +2486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = '(' . join( ' AND ', $e_status ) . ')';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $r_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $q['perm'] ) && 'editable' == $q['perm'] && ! current_user_can( $edit_others_cap ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $q['perm'] ) && 'editable' === $q['perm'] && ! current_user_can( $edit_others_cap ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $r_status ) . '))';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = '(' . join( ' OR ', $r_status ) . ')';
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $p_status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $q['perm'] ) && 'readable' == $q['perm'] && ! current_user_can( $read_private_cap ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $q['perm'] ) && 'readable' === $q['perm'] && ! current_user_can( $read_private_cap ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . 'AND (' . join( ' OR ', $p_status ) . '))';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $statuswheres[] = '(' . join( ' OR ', $p_status ) . ')';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2515,7 +2515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Add public states.
</span><span class="cx" style="display: block; padding: 0 10px"> $public_states = get_post_stati( array( 'public' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $public_states as $state ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $state ) { // Publish is hard-coded above.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $state ) { // Publish is hard-coded above.
</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"> $where .= " OR {$wpdb->posts}.post_status = '$state'";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2948,7 +2948,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = apply_filters_ref_array( 'posts_pre_query', array( null, &$this ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ids' == $q['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ids' === $q['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( null === $this->posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = $wpdb->get_col( $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2960,7 +2960,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->posts;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id=>parent' == $q['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id=>parent' === $q['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( null === $this->posts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = $wpdb->get_results( $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2980,7 +2980,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 ( null === $this->posts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && ! empty( $limits ) && $q['posts_per_page'] < 500 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" === $fields && ! empty( $limits ) && $q['posts_per_page'] < 500 );
</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 whether to split the query.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3093,7 +3093,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->posts = array();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_preview = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'future' != $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' !== $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->posts[0]->post_date = current_time( 'mysql' );
</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">@@ -3481,7 +3481,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query = $this->tax_query->queried_terms[ $matched_taxonomy ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $query['terms'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'term_id' == $query['field'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'term_id' === $query['field'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $term = get_term( reset( $query['terms'] ), $matched_taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3876,7 +3876,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return (bool) $this->is_feed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $qv = $this->get( 'feed' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'feed' == $qv ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'feed' === $qv ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $qv = get_default_feed();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return in_array( $qv, (array) $feeds, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3911,9 +3911,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_front_page() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Most likely case.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'posts' == get_option( 'show_on_front' ) && $this->is_home() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'posts' === get_option( 'show_on_front' ) && $this->is_home() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' )
+ && $this->is_page( get_option( 'page_on_front' ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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">@@ -3954,7 +3956,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if Privacy Policy page.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_privacy_policy() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_option( 'wp_page_for_privacy_policy' ) && $this->is_page( 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' )
+ && $this->is_page( get_option( 'wp_page_for_privacy_policy' ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</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></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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -526,7 +526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match_all( '/%.+?%/', $this->permalink_structure, $tokens );
</span><span class="cx" style="display: block; padding: 0 10px"> $tok_index = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tokens[0] as $token ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '%post_id%' == $token && ( $tok_index <= 3 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '%post_id%' === $token && ( $tok_index <= 3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $front = $front . 'date/';
</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">@@ -1261,10 +1261,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // robots.txt -- only if installed at the root.
</span><span class="cx" style="display: block; padding: 0 10px"> $home_path = parse_url( home_url() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $robots_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $robots_rewrite = ( empty( $home_path['path'] ) || '/' === $home_path['path'] ) ? array( 'robots\.txt$' => $this->index . '?robots=1' ) : array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // favicon.ico -- only if installed at the root.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $favicon_rewrite = ( empty( $home_path['path'] ) || '/' == $home_path['path'] ) ? array( 'favicon\.ico$' => $this->index . '?favicon=1' ) : array();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $favicon_rewrite = ( empty( $home_path['path'] ) || '/' === $home_path['path'] ) ? array( 'favicon\.ico$' => $this->index . '?favicon=1' ) : array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Old feed and service files.
</span><span class="cx" style="display: block; padding: 0 10px"> $deprecated_files = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1404,8 +1404,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $rules Array of rewrite rules generated for the current permastruct, keyed by their regex pattern.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $rules = apply_filters( "{$permastructname}_rewrite_rules", $rules );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_tag' == $permastructname ) {
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' === $permastructname ) {
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters rewrite rules used specifically for Tags.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1647,7 +1648,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $external ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->add_external_rule( $regex, $query );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'bottom' == $after ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'bottom' === $after ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->extra_rules = array_merge( $this->extra_rules, array( $regex => $query ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->extra_rules_top = array_merge( $this->extra_rules_top, array( $regex => $query ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1854,8 +1855,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->search_structure );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->feed_structure );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->comment_feed_structure );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->use_trailing_slashes = ( '/' == substr( $this->permalink_structure, -1, 1 ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->use_trailing_slashes = ( '/' === substr( $this->permalink_structure, -1, 1 ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Enable generic rules for pages if permalink structure doesn't begin with a wildcard.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^[^%]*%(?:postname|category|tag|author)%/', $this->permalink_structure ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->use_verbose_page_rules = true;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsitequeryphp"></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-site-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site-query.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-site-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -297,7 +297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * The expected return type from this filter depends on the value passed in the request query_vars:
</span><span class="cx" style="display: block; padding: 0 10px"> * When `$this->query_vars['count']` is set, the filter should return the site count as an int.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * When `'ids' == $this->query_vars['fields']`, the filter should return an array of site ids.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * When `'ids' === $this->query_vars['fields']`, the filter should return an array of site ids.
</ins><span class="cx" style="display: block; padding: 0 10px"> * Otherwise the filter should return an array of WP_Site objects.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.2.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -353,7 +353,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_ids = array_map( 'intval', $site_ids );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ids' == $this->query_vars['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ids' === $this->query_vars['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->sites = $site_ids;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->sites;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptaxqueryphp"></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-tax-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-tax-query.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-tax-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $clause['terms'];
</span><span class="cx" style="display: block; padding: 0 10px"> $operator = strtoupper( $clause['operator'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'IN' == $operator ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'IN' === $operator ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return self::$no_results;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -430,7 +430,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = "$alias.term_taxonomy_id $operator ($terms)";
</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 ( 'NOT IN' == $operator ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'NOT IN' === $operator ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $sql;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -444,7 +444,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE term_taxonomy_id IN ($terms)
</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">- } elseif ( 'AND' == $operator ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'AND' === $operator ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $sql;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -641,7 +641,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 ( 'AND' == $query['operator'] && count( $term_list ) < count( $query['terms'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'AND' === $query['operator'] && count( $term_list ) < count( $query['terms'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = new WP_Error( 'inexistent_terms', __( 'Inexistent terms.' ) );
</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="trunksrcwpincludesclasswptaxonomyphp"></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-taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-taxonomy.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-taxonomy.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['query_var'] = 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 ( false !== $args['rewrite'] && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $args['rewrite'] && ( is_admin() || get_option( 'permalink_structure' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['rewrite'] = wp_parse_args(
</span><span class="cx" style="display: block; padding: 0 10px"> $args['rewrite'],
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +400,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp->add_query_var( $this->query_var );
</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 !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false !== $this->rewrite && ( is_admin() || get_option( 'permalink_structure' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $this->hierarchical && $this->rewrite['hierarchical'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = '(.+?)';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></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-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-term-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query['child_of'] = 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 ( 'all' == $query['get'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $query['get'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query['childless'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $query['child_of'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $query['hide_empty'] = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,7 +341,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['child_of'] = 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 ( 'all' == $args['get'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $args['get'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['childless'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $args['child_of'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $args['hide_empty'] = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +382,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 ( ! $in_hierarchy ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'count' == $args['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'count' === $args['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->terms = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,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"> $hierarchical = $args['hierarchical'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'count' == $args['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'count' === $args['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $hierarchical = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $args['hide_empty'] && ! $hierarchical ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -709,7 +709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->terms;
</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 ( 'count' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'count' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = $wpdb->get_var( $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( $cache_key, $count, 'terms' );
</span><span class="cx" style="display: block; padding: 0 10px"> return $count;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -716,7 +716,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = $wpdb->get_results( $this->request );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all' == $_fields || 'all_with_object_id' === $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'all' === $_fields || 'all_with_object_id' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_term_cache( $terms );
</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">@@ -741,7 +742,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"> // Update term counts to include children.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $args['pad_counts'] && 'all' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $args['pad_counts'] && 'all' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $_tax ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _pad_term_counts( $terms, $_tax );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,7 +774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * `$fields` is 'all_with_object_id', but should otherwise be
</span><span class="cx" style="display: block; padding: 0 10px"> * removed.
</span><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( $args['object_ids'] ) && 'all_with_object_id' != $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $args['object_ids'] ) && 'all_with_object_id' !== $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_tt_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,31 +790,31 @@
</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"> $_terms = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id=>parent' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id=>parent' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[ $term->term_id ] = $term->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 ( 'ids' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'ids' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[] = (int) $term->term_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">- } elseif ( 'tt_ids' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'tt_ids' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[] = (int) $term->term_taxonomy_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">- } elseif ( 'names' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'names' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[] = $term->name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'slugs' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'slugs' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[] = $term->slug;
</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 ( 'id=>name' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'id=>name' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[ $term->term_id ] = $term->name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'id=>slug' == $_fields ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'id=>slug' === $_fields ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_terms[ $term->term_id ] = $term->slug;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -862,15 +863,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "tt.$_orderby";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'term_order' === $_orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'tr.term_order';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'include' == $_orderby && ! empty( $this->query_vars['include'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'include' === $_orderby && ! empty( $this->query_vars['include'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $include = implode( ',', wp_parse_id_list( $this->query_vars['include'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( t.term_id, $include )";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'slug__in' == $_orderby && ! empty( $this->query_vars['slug'] ) && is_array( $this->query_vars['slug'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'slug__in' === $_orderby && ! empty( $this->query_vars['slug'] ) && is_array( $this->query_vars['slug'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $slugs = implode( "', '", array_map( 'sanitize_title_for_query', $this->query_vars['slug'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = "FIELD( t.slug, '" . $slugs . "')";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'none' == $_orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'none' === $_orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( empty( $_orderby ) || 'id' == $_orderby || 'term_id' === $_orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( empty( $_orderby ) || 'id' === $_orderby || 'term_id' === $_orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = 't.term_id';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = 't.name';
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-theme.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -340,7 +340,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // wp-content/themes/directory-of-themes/*
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_dir = dirname( $this->stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px"> $directories = search_theme_directories();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '.' !== $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->template = $parent_dir . '/' . $this->template;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $directories && isset( $directories[ $this->template ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Look for the template in the search_theme_directories() results, in case it is in another theme root.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1142,7 +1143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_screenshot( $uri = 'uri' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $screenshot = $this->cache_get( 'screenshot' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $screenshot ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'relative' == $uri ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'relative' === $uri ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $screenshot;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1153,7 +1154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->cache_add( 'screenshot', 'screenshot.' . $ext );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'relative' == $uri ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'relative' === $uri ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'screenshot.' . $ext;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1319,7 +1320,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"> $relative_path = trailingslashit( $relative_path );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/' == $relative_path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' === $relative_path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $relative_path = '';
</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">@@ -1336,7 +1337,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $exclusions = (array) apply_filters( 'theme_scandir_exclusions', array( 'CVS', 'node_modules', 'vendor', 'bower_components' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $result ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' == $result[0] || in_array( $result, $exclusions, true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === $result[0] || in_array( $result, $exclusions, true ) ) {
</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 ( is_dir( $path . '/' . $result ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1407,7 +1408,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 ( 'both' == $check || 'network' == $check ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'both' === $check || 'network' === $check ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed = self::get_allowed_on_network();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1414,7 +1415,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 ( 'both' == $check || 'site' == $check ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'both' === $check || 'site' === $check ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed = self::get_allowed_on_site( $blog_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-user-query.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -242,7 +242,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields[] = "$wpdb->users.$field";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = implode( ',', $this->query_fields );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'all' == $qv['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'all' === $qv['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = "$wpdb->users.*";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_fields = "$wpdb->users.ID";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -320,7 +320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_query = new WP_Meta_Query();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->meta_query->parse_query_vars( $qv );
</span><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( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $qv['who'] ) && 'authors' === $qv['who'] && $blog_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $who_query = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'key' => $wpdb->get_blog_prefix( $blog_id ) . 'user_level',
</span><span class="cx" style="display: block; padding: 0 10px"> 'value' => 0,
</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"> if ( null === $this->results ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
</span><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_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $qv['fields'] ) || 'all' === $qv['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->results = $wpdb->get_results( $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->results = $wpdb->get_col( $this->request );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -642,7 +642,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 ( 'all_with_meta' == $qv['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all_with_meta' === $qv['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> cache_users( $this->results );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $r = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +651,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"> $this->results = $r;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'all' == $qv['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'all' === $qv['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->results as $key => $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,12 +703,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $searches = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
- $trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $leading_wild = ( 'leading' === $wild || 'both' === $wild ) ? '%' : '';
+ $trailing_wild = ( 'trailing' === $wild || 'both' === $wild ) ? '%' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cols as $col ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'ID' == $col ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'ID' === $col ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $searches[] = $wpdb->prepare( "$col = %s", $string );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $searches[] = $wpdb->prepare( "$col LIKE %s", $like );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -760,9 +760,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'user_' . $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = $orderby;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'name' == $orderby || 'display_name' == $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'name' === $orderby || 'display_name' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'display_name';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_count' == $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_count' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // @todo Avoid the JOIN.
</span><span class="cx" style="display: block; padding: 0 10px"> $where = get_posts_by_author_sql( 'post' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->query_from .= " LEFT OUTER JOIN (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -773,11 +773,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) p ON ({$wpdb->users}.ID = p.post_author)
</span><span class="cx" style="display: block; padding: 0 10px"> ";
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'post_count';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'ID' == $orderby || 'id' == $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'ID' === $orderby || 'id' === $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'ID';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'meta_value' === $orderby || $this->get( 'meta_key' ) == $orderby ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = "$wpdb->usermeta.meta_value";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'meta_value_num' == $orderby ) {
</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"> $_orderby = "$wpdb->usermeta.meta_value+0";
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $include = wp_parse_id_list( $this->query_vars['include'] );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-user.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field = '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 ( 'id' == $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id' === $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Make sure the value is numeric to avoid casting objects, for example,
</span><span class="cx" style="display: block; padding: 0 10px"> // to int 1.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_numeric( $value ) ) {
</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"> * @return bool Whether the given user meta key is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __isset( $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_User->id',
</span><span class="cx" style="display: block; padding: 0 10px"> '2.1.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Value of the given user meta key (if set). If `$key` is 'id', the user ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_User->id',
</span><span class="cx" style="display: block; padding: 0 10px"> '2.1.0',
</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"> * @param mixed $value User meta value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __set( $key, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_User->id',
</span><span class="cx" style="display: block; padding: 0 10px"> '2.1.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $key User meta key to unset.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __unset( $key ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'id' == $key ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'id' === $key ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> 'WP_User->id',
</span><span class="cx" style="display: block; padding: 0 10px"> '2.1.0',
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1131,7 +1131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '0' == $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'hold';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'spam' == $comment->comment_approved ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'spam' === $comment->comment_approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'spam';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '1' == $comment->comment_approved ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'approve';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3379,7 +3379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_id = wp_insert_category( $new_category, true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $cat_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'term_exists' == $cat_id->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'term_exists' === $cat_id->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) $cat_id->get_error_data();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 500, __( 'Sorry, the category could not be created.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3912,7 +3912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment['user_ID'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_option( 'require_name_email' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 6 > strlen( $comment['comment_author_email'] ) || '' == $comment['comment_author'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strlen( $comment['comment_author_email'] < 6 ) || '' === $comment['comment_author'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'Comment author name and email are required.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! is_email( $comment['comment_author_email'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 403, __( 'A valid email address is required.' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5720,7 +5720,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"> $page_template = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $content_struct['wp_page_template'] ) && 'page' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $content_struct['wp_page_template'] ) && 'page' === $post_type ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5847,7 +5847,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' === $post_status || 'private' === $post_status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post_type && ! current_user_can( 'publish_pages' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === $post_type && ! current_user_can( 'publish_pages' ) ) {
</ins><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="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Sorry, you are not allowed to publish this 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">@@ -6020,8 +6020,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the author info.
</span><span class="cx" style="display: block; padding: 0 10px"> $author = get_userdata( $postdata['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allow_comments = ( 'open' == $postdata['comment_status'] ) ? 1 : 0;
- $allow_pings = ( 'open' == $postdata['ping_status'] ) ? 1 : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allow_comments = ( 'open' === $postdata['comment_status'] ) ? 1 : 0;
+ $allow_pings = ( 'open' === $postdata['ping_status'] ) ? 1 : 0;
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( 'future' === $postdata['post_status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6172,8 +6172,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the post author info.
</span><span class="cx" style="display: block; padding: 0 10px"> $author = get_userdata( $entry['post_author'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $allow_comments = ( 'open' == $entry['comment_status'] ) ? 1 : 0;
- $allow_pings = ( 'open' == $entry['ping_status'] ) ? 1 : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allow_comments = ( 'open' === $entry['comment_status'] ) ? 1 : 0;
+ $allow_pings = ( 'open' === $entry['ping_status'] ) ? 1 : 0;
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( 'future' === $entry['post_status'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6681,7 +6681,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $trackback_pings = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trackback' == $comment->comment_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trackback' === $comment->comment_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = $comment->comment_content;
</span><span class="cx" style="display: block; padding: 0 10px"> $title = substr( $content, 8, ( strpos( $content, '</strong>' ) - 8 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $trackback_pings[] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7028,7 +7028,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $pingbacks = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $comment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'pingback' == $comment->comment_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'pingback' === $comment->comment_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pingbacks[] = $comment->comment_author_url;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/class-wp.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,7 +420,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Set the correct content type for feeds.
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $this->query_vars['feed'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'feed' == $this->query_vars['feed'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'feed' === $this->query_vars['feed'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = get_default_feed();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $headers['Content-Type'] = feed_content_type( $type ) . '; charset=' . get_option( 'blog_charset' );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/comment-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -193,7 +193,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( ( ! empty( $email ) ) && ( '@' !== $email ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $display = ( '' != $linktext ) ? $linktext : $email;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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">@@ -221,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_comment_author_url( $comment );
</span><span class="cx" style="display: block; padding: 0 10px"> $author = get_comment_author( $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( $url ) || 'http://' == $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $url ) || 'http://' === $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = $author;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $return = "<a href='$url' rel='external nofollow ugc' class='url'>$author</a>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $id = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $comment ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_url = ( 'http://' == $comment->comment_author_url ) ? '' : $comment->comment_author_url;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_url = ( 'http://' === $comment->comment_author_url ) ? '' : $comment->comment_author_url;
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = esc_url( $author_url, array( 'http', 'https' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $comment->comment_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -376,11 +376,11 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/' == substr( $display, -1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/' === substr( $display, -1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $display = substr( $display, 0, -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">@@ -550,11 +550,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_date( $format = '', $comment_ID = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' === $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = mysql2date( get_option( 'date_format' ), $comment->comment_date );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = mysql2date( $format, $comment->comment_date );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the returned comment date.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,7 +1039,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' === $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date = mysql2date( get_option( 'time_format' ), $comment_date, $translate );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $date = mysql2date( $format, $comment_date, $translate );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1080,7 +1083,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_comment_type( $comment_ID = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = get_comment( $comment_ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $comment->comment_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' === $comment->comment_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment->comment_type = 'comment';
</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">@@ -1141,7 +1145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The trackback URL after being filtered.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_trackback_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != get_option( 'permalink_structure' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'permalink_structure' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tb_url = trailingslashit( get_permalink() ) . user_trailingslashit( 'trackback', 'single_trackback' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $tb_url = get_option( 'siteurl' ) . '/wp-trackback.php?p=' . get_the_ID();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1235,7 +1239,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $post_id = $_post ? $_post->ID : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $open = ( 'open' == $_post->comment_status );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $open = ( 'open' === $_post->comment_status );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the current post is open for comments.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1265,7 +1269,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> $post_id = $_post ? $_post->ID : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $open = ( 'open' == $_post->ping_status );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $open = ( 'open' === $_post->ping_status );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the current post is open for pings.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1505,8 +1509,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"> $overridden_cpage = false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- set_query_var( 'cpage', 'newest' == get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ set_query_var( 'cpage', 'newest' === get_option( 'default_comments_page' ) ? get_comment_pages_count() : 1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $overridden_cpage = 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">@@ -1515,6 +1520,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"> $theme_template = STYLESHEETPATH . $file;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the path to the theme template file used for the comments template.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1523,6 +1529,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $theme_template The path to the theme template file.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $include = apply_filters( 'comments_template', $theme_template );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $include ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> require $include;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( file_exists( TEMPLATEPATH . $file ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2060,7 +2067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comments ) ) {
</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 ( 'all' != $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_by_type = separate_comments( $comments );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2101,7 +2108,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = get_comments( $comment_args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'all' != $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_by_type = separate_comments( $comments );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $comments_by_type[ $parsed_args['type'] ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2118,7 +2125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wp_query->comments ) ) {
</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 ( 'all' != $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' !== $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $wp_query->comments_by_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_query->comments_by_type = separate_comments( $wp_query->comments );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2174,7 +2181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['page'] = get_query_var( 'cpage' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $threaded = ( -1 != $parsed_args['max_depth'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['page'] = ( 'newest' == get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $parsed_args['per_page'], $threaded ) : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['page'] = ( 'newest' === get_option( 'default_comments_page' ) ) ? get_comment_pages_count( $_comments, $parsed_args['per_page'], $threaded ) : 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> set_query_var( 'cpage', $parsed_args['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">@@ -2185,7 +2192,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 ( null === $parsed_args['reverse_top_level'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['reverse_top_level'] = ( 'desc' == get_option( 'comment_order' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['reverse_top_level'] = ( 'desc' === get_option( 'comment_order' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_queue_comments_for_comment_meta_lazyload( $_comments );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/comment.php 2020-05-16 18:40:52 UTC (rev 47808)
</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">@@ -963,14 +963,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'pingback' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'pings' => 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">- $count = count( $comments );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $count = count( $comments );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < $count; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $comments[ $i ]->comment_type;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'comment';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_by_type[ $type ][] = &$comments[ $i ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trackback' == $type || 'pingback' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'trackback' === $type || 'pingback' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comments_by_type['pings'][] = &$comments[ $i ];
</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">@@ -1281,7 +1286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mod_keys = trim( get_option( 'blacklist_keys' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $mod_keys ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $mod_keys ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false; // If moderation keys are empty.
</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">@@ -1671,9 +1676,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 'approved';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '0' == $approved ) {
</span><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 ( 'spam' == $approved ) {
</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 ( 'trash' == $approved ) {
</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">@@ -2114,9 +2119,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"> $commentdata['comment_parent'] = isset( $commentdata['comment_parent'] ) ? absint( $commentdata['comment_parent'] ) : 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
- $commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_status = ( $commentdata['comment_parent'] > 0 ) ? wp_get_comment_status( $commentdata['comment_parent'] ) : '';
+
+ $commentdata['comment_parent'] = ( 'approved' === $parent_status || 'unapproved' === $parent_status ) ? $commentdata['comment_parent'] : 0;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $commentdata['comment_author_IP'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2375,9 +2382,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $data['comment_approved'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'hold' == $data['comment_approved'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'hold' === $data['comment_approved'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'approve' == $data['comment_approved'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'approve' === $data['comment_approved'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['comment_approved'] = 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">@@ -2800,7 +2807,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $services = explode( "\n", $services );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $services as $service ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $service = trim( $service );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $service ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $service ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> weblog_ping( $service );
</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">@@ -2985,7 +2992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> include_once ABSPATH . WPINC . '/class-wp-http-ixr-client.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Using a timeout of 3 seconds should be enough to cover slow servers.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $client = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' == $path ) ) ? false : $path ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $client = new WP_HTTP_IXR_Client( $server, ( ( ! strlen( trim( $path ) ) || ( '/' === $path ) ) ? false : $path ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $client->timeout = 3;
</span><span class="cx" style="display: block; padding: 0 10px"> $client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3266,7 +3273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // get_post_status() will get the parent status for attachments.
</span><span class="cx" style="display: block; padding: 0 10px"> $status = get_post_status( $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 ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'private' === $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'comment_id_not_found' );
</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">@@ -3285,7 +3292,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
</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 ( 'trash' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'trash' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires when a comment is attempted on a trashed post.
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/feed.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +85,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'rss2'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $default_feed = apply_filters( 'default_feed', 'rss2' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'rss' == $default_feed ? 'rss2' : $default_feed;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return ( 'rss' === $default_feed ) ? 'rss2' : $default_feed;
</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">@@ -160,8 +161,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title The current 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">- $title = apply_filters( 'the_title_rss', $title );
- return $title;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'the_title_rss', $title );
</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">@@ -190,6 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $content = apply_filters( 'the_content', get_the_content() );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( ']]>', ']]>', $content );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the post content for use in feeds.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +383,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_names = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filter = 'rss';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'atom' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'atom' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filter = 'raw';
</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">@@ -401,9 +402,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $cat_names = array_unique( $cat_names );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cat_names as $cat_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rdf' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'rdf' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_list .= "\t\t<dc:subject><![CDATA[$cat_name]]></dc:subject>\n";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'atom' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'atom' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_list .= sprintf( '<category scheme="%1$s" term="%2$s" />', esc_attr( get_bloginfo_rss( 'url' ) ), esc_attr( $cat_name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_list .= "\t\t<category><![CDATA[" . html_entity_decode( $cat_name, ENT_COMPAT, get_option( 'blog_charset' ) ) . "]]></category>\n";
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/formatting.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,7 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $prime_pattern, $prime, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '"' == $needle && false !== strpos( $sentence, '"' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"' === $needle && false !== strpos( $sentence, '"' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sentence = str_replace( '"', $close_quote, $sentence );
</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">@@ -1938,7 +1938,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Used for locale-specific rules.
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $locale, array( 'de_DE', 'de_DE_formal', 'de_CH', 'de_CH_informal' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $chars['Ä'] = 'Ae';
</span><span class="cx" style="display: block; padding: 0 10px"> $chars['ä'] = 'ae';
</span><span class="cx" style="display: block; padding: 0 10px"> $chars['Ö'] = 'Oe';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2179,7 +2179,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_title = $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 ( 'save' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'save' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = remove_accents( $title );
</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">@@ -2246,7 +2246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = strtolower( $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 ( 'save' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'save' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Convert  , &ndash, and &mdash to hyphens.
</span><span class="cx" style="display: block; padding: 0 10px"> $title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
</span><span class="cx" style="display: block; padding: 0 10px"> // Convert  , &ndash, and &mdash HTML entities to hyphens.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,7 +2354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Limit to A-Z, a-z, 0-9, '_', '-'.
</span><span class="cx" style="display: block; padding: 0 10px"> $sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $sanitized && $fallback ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $sanitized && $fallback ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return sanitize_html_class( $fallback );
</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">@@ -2836,7 +2836,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _make_url_clickable_cb( $matches ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = $matches[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 ( ')' == $matches[3] && strpos( $url, '(' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ')' === $matches[3] && strpos( $url, '(' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it,
</span><span class="cx" style="display: block; padding: 0 10px"> // add the closing parenthesis to the URL. Then we can let the parenthesis balancer do its thing below.
</span><span class="cx" style="display: block; padding: 0 10px"> $url .= $matches[3];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3370,17 +3370,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = $textarr[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're in an ignore block, wait until we find its closing tag.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')[^>]*>/', $content, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')[^>]*>/', $content, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore_block_element = $matches[1];
</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 it's not a tag and not in ignore block.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
</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"> // Did we exit ignore block?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $ignore_block_element && '</' . $ignore_block_element . '>' === $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore_block_element = '';
</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">@@ -3573,7 +3573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'Z' === $timezone ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $sign = ( substr( $timezone, 0, 1 ) == '+' ) ? 1 : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sign = ( '+' === substr( $timezone, 0, 1 ) ) ? 1 : -1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $hours = intval( substr( $timezone, 1, 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $minutes = intval( substr( $timezone, 3, 4 ) ) / 60;
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = $sign * HOUR_IN_SECONDS * ( $hours + $minutes );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3813,7 +3813,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_trim_excerpt( $text = '', $post = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_excerpt = $text;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $text ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' === $text ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = get_the_content( '', false, $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4307,7 +4308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function esc_url( $url, $protocols = null, $_context = 'display' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_url = $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 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $url ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -4335,7 +4336,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"> // Replace ampersands and single quotes only when displaying.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'display' == $_context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'display' === $_context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = wp_kses_normalize_entities( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '&', '&', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( "'", ''', $url );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4645,7 +4646,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 ( '0' == $value || '' == $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">@@ -4977,7 +4978,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"> // Literal %: append and continue.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $pattern, $start, 2 ) == '%%' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '%%' === substr( $pattern, $start, 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $start += 2;
</span><span class="cx" style="display: block; padding: 0 10px"> $result .= '%';
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5043,7 +5044,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_sprintf_l( $pattern, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Not a match.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $pattern, 0, 2 ) != '%l' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '%l' !== substr( $pattern, 0, 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $pattern;
</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">@@ -5806,12 +5807,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = $textarr[ $i ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're in an ignore block, wait until we find its closing tag.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore_block_element = $matches[1];
</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 it's not a tag and not in ignore block.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] && false !== strpos( $content, '&#x' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] && false !== strpos( $content, '&#x' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $possible_emoji as $emojum => $emoji_char ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === strpos( $content, $emojum ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5827,7 +5828,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"> // Did we exit ignore block?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $ignore_block_element && '</' . $ignore_block_element . '>' === $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore_block_element = '';
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,7 +640,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"> $data = trim( $data );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'N;' == $data ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'N;' === $data ) {
</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 ( strlen( $data ) < 4 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1517,7 +1517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if yes, false on anything else.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function bool_from_yn( $yn ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( strtolower( $yn ) == 'y' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( 'y' === strtolower( $yn ) );
</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">@@ -1540,7 +1540,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">@@ -1841,6 +1841,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $referer_field;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $referer_field;
</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">@@ -1860,13 +1861,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ref = wp_get_original_referer();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $ref ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ref = ( 'previous' === $jump_back_to ) ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $echo ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $orig_referer_field;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $orig_referer_field;
</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">@@ -1972,7 +1977,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to find the permissions of the parent folder that exists and inherit that.
</span><span class="cx" style="display: block; padding: 0 10px"> $target_parent = dirname( $target );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( '.' != $target_parent && ! is_dir( $target_parent ) && dirname( $target_parent ) !== $target_parent ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( '.' !== $target_parent && ! is_dir( $target_parent ) && dirname( $target_parent ) !== $target_parent ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $target_parent = dirname( $target_parent );
</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">@@ -2334,7 +2339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $siteurl = get_option( 'siteurl' );
</span><span class="cx" style="display: block; padding: 0 10px"> $upload_path = trim( get_option( 'upload_path' ) );
</span><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( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $upload_path ) || 'wp-content/uploads' === $upload_path ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $dir = WP_CONTENT_DIR . '/uploads';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $dir is absolute, $upload_path is (maybe) relative to ABSPATH.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2345,7 +2350,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_option( 'upload_url_path' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $upload_path ) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $upload_path ) || ( 'wp-content/uploads' === $upload_path ) || ( $upload_path == $dir ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = WP_CONTENT_URL . '/uploads';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( $siteurl ) . $upload_path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3211,7 +3216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $action The nonce action.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_nonce_ays( $action ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'log-out' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'log-out' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $html = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Site title. */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'You are attempting to log out of %s' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3539,7 +3544,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"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'rtl' == $text_direction ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'rtl' === $text_direction ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo 'body { font-family: Tahoma, Arial; }';
</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">@@ -4333,7 +4338,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">@@ -5214,7 +5219,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function is_lighttpd_before_150() {
</span><span class="cx" style="display: block; padding: 0 10px"> $server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] ) ? $_SERVER['SERVER_SOFTWARE'] : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $server_parts[1] = isset( $server_parts[1] ) ? $server_parts[1] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return 'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ return ( 'lighttpd' === $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.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">@@ -5248,6 +5254,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -5274,7 +5281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
</span><span class="cx" style="display: block; padding: 0 10px"> * via ISAPI then pretty permalinks will not work.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $supports_permalinks = class_exists( 'DOMDocument', false ) && isset( $_SERVER['IIS_UrlRewriteModule'] ) && ( PHP_SAPI == 'cgi-fcgi' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $supports_permalinks = class_exists( 'DOMDocument', false ) && isset( $_SERVER['IIS_UrlRewriteModule'] ) && ( 'cgi-fcgi' === PHP_SAPI );
</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">@@ -5324,7 +5331,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"> // Absolute Windows drive paths are not allowed:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ':' == substr( $file, 1, 1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ':' === substr( $file, 1, 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 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">@@ -5364,7 +5371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The guessed URL.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_guess_url() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WP_SITEURL' ) && '' != WP_SITEURL ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'WP_SITEURL' ) && '' !== WP_SITEURL ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = WP_SITEURL;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $abspath_fix = str_replace( '\\', '/', ABSPATH );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5375,7 +5382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The request is for a file in ABSPATH.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $script_filename_dir . '/' == $abspath_fix ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $script_filename_dir . '/' === $abspath_fix ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Strip off any file/query params in the path.
</span><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5935,7 +5942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $del_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 ( ! $del_post || 'trash' != $del_post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $del_post || 'trash' !== $del_post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_trash_meta_status' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_trash_meta_time' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5953,7 +5960,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $del_comment = get_comment( $comment_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 ( ! $del_comment || 'trash' != $del_comment->comment_approved ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $del_comment || 'trash' !== $del_comment->comment_approved ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_comment_meta( $comment_id, '_wp_trash_meta_time' );
</span><span class="cx" style="display: block; padding: 0 10px"> delete_comment_meta( $comment_id, '_wp_trash_meta_status' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/general-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +253,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $format = apply_filters( 'search_form_format', $format );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $search_form_template = locate_template( 'searchform.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $search_form_template ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' !== $search_form_template ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> require $search_form_template;
</span><span class="cx" style="display: block; padding: 0 10px"> $form = ob_get_clean();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -268,7 +269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $aria_label = '';
</span><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' == $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'html5' === $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $form = '<form role="search" ' . $aria_label . 'method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -762,7 +763,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'charset':
</span><span class="cx" style="display: block; padding: 0 10px"> $output = get_option( 'blog_charset' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $output ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $output ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output = 'UTF-8';
</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">@@ -816,7 +817,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 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 ( 'display' == $filter ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'display' === $filter ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the URL returned by get_bloginfo().
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1286,7 +1287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $title_array = apply_filters( 'wp_title_parts', explode( $t_sep, $title ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Determines position of the separator and direction of the breadcrumb.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'right' == $seplocation ) { // Separator on right, so reverse the order.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'right' === $seplocation ) { // Separator on right, so reverse the order.
</ins><span class="cx" style="display: block; padding: 0 10px"> $title_array = array_reverse( $title_array );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = implode( " $sep ", $title_array ) . $prefix;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1834,9 +1835,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_post_type_viewable( $post_type_object ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['post_type'] = $post_type_object->name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['type'] = 'monthly';
</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">@@ -1881,7 +1883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = $parsed_args['limit'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'monthly' == $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'monthly' === $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = "wp_get_archives:$key:$last_changed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1906,7 +1908,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'yearly' == $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'yearly' === $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = "wp_get_archives:$key:$last_changed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1930,7 +1932,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'daily' == $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'daily' === $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = "wp_get_archives:$key:$last_changed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1955,7 +1957,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'weekly' == $parsed_args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'weekly' === $parsed_args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $week = _wp_mysql_week( '`post_date`' );
</span><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $query );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1994,8 +1996,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( 'postbypost' == $parsed_args['type'] ) || ( 'alpha' == $parsed_args['type'] ) ) {
- $orderby = ( 'alpha' == $parsed_args['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( 'postbypost' === $parsed_args['type'] ) || ( 'alpha' === $parsed_args['type'] ) ) {
+ $orderby = ( 'alpha' === $parsed_args['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
</ins><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
</span><span class="cx" style="display: block; padding: 0 10px"> $key = md5( $query );
</span><span class="cx" style="display: block; padding: 0 10px"> $key = "wp_get_archives:$key:$last_changed";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2402,7 +2404,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 ( '' == $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_date = get_post_time( get_option( 'date_format' ), false, $post, true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_date = get_post_time( $format, false, $post, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2531,7 +2533,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 ( '' == $format ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $format ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $the_time = get_post_time( get_option( 'time_format' ), false, $post, true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $the_time = get_post_time( $format, false, $post, true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3342,7 +3344,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $wp_rich_edit ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rich_edit = 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 ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // Default to 'true' for logged out users.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'true' === get_user_option( 'rich_editing' ) || ! is_user_logged_in() ) { // Default to 'true' for logged out users.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $is_safari ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_IE ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/http.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,7 +375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $url && ! isset( $capabilities['ssl'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = parse_url( $url, PHP_URL_SCHEME );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'https' == $scheme || 'ssl' == $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'https' === $scheme || 'ssl' === $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $capabilities['ssl'] = 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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/kses.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,12 +775,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove quotes surrounding $value.
</span><span class="cx" style="display: block; padding: 0 10px"> // Also guarantee correct quoting in $string for this one attribute.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $value ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $quote = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $quote = $value[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 ( '"' == $quote || "'" == $quote ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"' === $quote || "'" === $quote ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $value, -1 ) != $quote ) {
</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">@@ -1039,17 +1039,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $string = wp_kses_stripslashes( $string );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // It matched a ">" character.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $string, 0, 1 ) != '<' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '<' !== substr( $string, 0, 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 class="cx" style="display: block; padding: 0 10px"> // Allow HTML comments.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '<!--' == substr( $string, 0, 4 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '<!--' === substr( $string, 0, 4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string = str_replace( array( '<!--', '-->' ), '', $string );
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $newstring = wp_kses( $string, $allowed_html, $allowed_protocols ) ) != $string ) {
</span><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">@@ -1164,7 +1164,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_attr = $allowed_html[ $element_low ];
</span><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( $allowed_attr[ $name_low ] ) || '' == $allowed_attr[ $name_low ] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $allowed_attr[ $name_low ] ) || '' === $allowed_attr[ $name_low ] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * Allow `data-*` attributes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,7 +1189,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 ( 'style' == $name_low ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'style' === $name_low ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $new_value = safecss_filter_attr( $value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $new_value ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1609,7 +1609,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"> $string = preg_replace( '/[\x00-\x08\x0B\x0C\x0E-\x1F]/', '', $string );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'remove' == $options['slash_zero'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'remove' === $options['slash_zero'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $string = preg_replace( '/\\\\+0+/', '', $string );
</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">@@ -1688,7 +1688,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $string2[1] ) && ! preg_match( '%/\?%', $string2[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = trim( $string2[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = wp_kses_bad_protocol_once2( $string2[0], $allowed_protocols );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'feed:' == $protocol ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'feed:' === $protocol ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $count > 2 ) {
</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">@@ -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">@@ -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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/link-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -131,7 +131,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $leavename ? '' : '%pagename%',
</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( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_object( $post ) && isset( $post->filter ) && 'sample' === $post->filter ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sample = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $permalink && ! in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $permalink && ! in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $permalink, '%category%' ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = $wp_rewrite->get_feed_permastruct();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $permalink ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( '' !== $permalink ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $feed, 'comments_' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = str_replace( 'comments_', '', $feed );
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = $wp_rewrite->get_comment_feed_permastruct();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -681,7 +682,7 @@
</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"> $unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_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 ( '' != get_option( 'permalink_structure' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( get_option( 'permalink_structure' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post_id ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -794,7 +795,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $permalink_structure ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $permalink_structure ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,10 +867,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = get_option( 'permalink_structure' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $permalink_structure ) {
- if ( 'category' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $permalink_structure ) {
+ if ( 'category' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( "?feed=$feed&cat=$term_id" );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_tag' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_tag' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = home_url( "?feed=$feed&tag=$term->slug" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $t = get_taxonomy( $taxonomy );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,7 +887,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
</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 ( 'category' == $taxonomy ) {
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the category feed link.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -896,7 +897,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $feed Feed type. Possible values include 'rss2', 'atom'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $link = apply_filters( 'category_feed_link', $link, $feed );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_tag' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_tag' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the post tag feed link.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1364,7 +1365,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'revision' === $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'display' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'display' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $action = '&action=edit';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $action = '&action=edit';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2268,7 +2269,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $base = trailingslashit( get_bloginfo( '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 ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' !== $request ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $base .= $wp_rewrite->index . '/';
</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">@@ -2728,7 +2729,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"> // Make sure we get a string back. Plain is the next best thing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['type'] ) && 'array' === $args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['type'] = 'plain';
</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">@@ -2823,7 +2824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = get_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">- if ( 'newest' == get_option( 'default_comments_page' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'newest' === get_option( 'default_comments_page' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $pagenum != $max_page ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->using_permalinks() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = user_trailingslashit( trailingslashit( $result ) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3110,7 +3111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['echo'] = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure we get a string back. Plain is the next best thing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['type'] ) && 'array' === $args['type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['type'] = 'plain';
</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">@@ -3405,7 +3406,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $plugin ) && is_string( $plugin ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $folder = dirname( plugin_basename( $plugin ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' != $folder ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' !== $folder ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url .= '/' . ltrim( $folder, '/' );
</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">@@ -3451,7 +3452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_network = get_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">- if ( 'relative' == $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'relative' === $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $current_network->path;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3501,7 +3502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
</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 ( 'relative' == $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'relative' === $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = $current_network->path;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( 'http://' . $current_network->domain . $current_network->path, $scheme );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3645,7 +3646,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http:' . $url;
</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 ( 'relative' == $scheme ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'relative' === $scheme ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $url && '/' === $url[0] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = '/' . ltrim( $url, "/ \t\n\r\0\x0B" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3784,7 +3785,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_queried_object_id() === $post->ID ) {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == get_option( 'permalink_structure' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_option( 'permalink_structure' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $canonical_url = add_query_arg( 'page', $page, $canonical_url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $canonical_url = trailingslashit( $canonical_url ) . user_trailingslashit( $page, 'single_paged' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3873,10 +3874,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"> $post_id = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'query' == $context && is_singular() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'query' === $context && is_singular() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id = get_queried_object_id();
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_id = $post->ID;
</span></span></pre></div>
<a id="trunksrcwpincludesloadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/load.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/load.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER = array_merge( $default_server_values, $_SERVER );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Fix for IIS when running with PHP ISAPI.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_SERVER['REQUEST_URI'] ) || ( 'cgi-fcgi' !== PHP_SAPI && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // IIS Mod-Rewrite.
</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"> * @deprecated 5.4.0 Deprecated in favor of do_favicon().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_favicon_request() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '/favicon.ico' === $_SERVER['REQUEST_URI'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Type: image/vnd.microsoft.icon' );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $mu_plugins;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> while ( ( $plugin = readdir( $dh ) ) !== false ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $plugin, -4 ) == '.php' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.php' === substr( $plugin, -4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
</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">@@ -670,7 +670,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $active_plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! validate_file( $plugin ) // $plugin must validate as file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && '.php' === substr( $plugin, -4 ) // $plugin must end with '.php'.
</ins><span class="cx" style="display: block; padding: 0 10px"> && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
</span><span class="cx" style="display: block; padding: 0 10px"> // Not already included as a network plugin.
</span><span class="cx" style="display: block; padding: 0 10px"> && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins, true ) )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1168,7 +1168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'WPLANG' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == WPLANG ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === WPLANG ) {
</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"> $locales[] = WPLANG;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1263,7 +1263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_ssl() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_SERVER['HTTPS'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'on' === strtolower( $_SERVER['HTTPS'] ) ) {
</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="trunksrcwpincludesmediatemplatephp"></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-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/media-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -832,15 +832,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data-user-setting="urlbutton"
</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">- <option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' == wp.media.galleryDefaults.link ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="post" <# if ( ! wp.media.galleryDefaults.link || 'post' === wp.media.galleryDefaults.link ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> #>selected="selected"<# }
</span><span class="cx" style="display: block; padding: 0 10px"> #>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Attachment Page' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="file" <# if ( 'file' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="file" <# if ( 'file' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'Media File' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="none" <# if ( 'none' == wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="none" <# if ( 'none' === wp.media.galleryDefaults.link ) { #>selected="selected"<# } #>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php esc_html_e( 'None' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> </select>
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/meta.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_subtype = get_object_subtype( $meta_type, $object_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $column = sanitize_key( $meta_type . '_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // expected_slashed ($meta_key)
</span><span class="cx" style="display: block; padding: 0 10px"> $raw_meta_key = $meta_key;
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_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 ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately before updating a post's metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_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 ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after updating a post's metadata.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $type_column = sanitize_key( $meta_type . '_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // expected_slashed ($meta_key)
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_key = wp_unslash( $meta_key );
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_value = wp_unslash( $meta_value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -415,7 +416,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "delete_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Old-style action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately before deleting metadata for a post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "deleted_{$meta_type}_meta", $meta_ids, $object_id, $meta_key, $_meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Old-style action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after deleting metadata for a post.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +621,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">- $id_column = ( 'user' == $meta_type ) ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_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"> * Filters whether to retrieve metadata of a specific type by meta ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -685,7 +686,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"> $column = sanitize_key( $meta_type . '_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_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"> * Filters whether to update metadata of a specific type by meta ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -740,7 +741,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/meta.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "update_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_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 ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/meta.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'update_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,7 +758,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/meta.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "updated_{$meta_type}_meta", $meta_id, $object_id, $meta_key, $_meta_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 ( 'post' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-includes/meta.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'updated_postmeta', $meta_id, $object_id, $meta_key, $meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -801,7 +802,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Object and ID columns.
</span><span class="cx" style="display: block; padding: 0 10px"> $column = sanitize_key( $meta_type . '_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_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"> * Filters whether to delete metadata of a specific type by meta ID.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -829,7 +830,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "delete_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Old-style action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $meta_type || 'comment' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type || 'comment' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately before deleting post or comment metadata of a specific type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,7 +854,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( "deleted_{$meta_type}_meta", (array) $meta_id, $object_id, $meta->meta_key, $meta->meta_value );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Old-style action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $meta_type || 'comment' == $meta_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $meta_type || 'comment' === $meta_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Fires immediately after deleting post or comment metadata of a specific type.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,7 +944,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get meta info.
</span><span class="cx" style="display: block; padding: 0 10px"> $id_list = join( ',', $ids );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id_column = 'user' == $meta_type ? 'umeta_id' : 'meta_id';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id_column = ( 'user' === $meta_type ) ? 'umeta_id' : 'meta_id';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_list = $wpdb->get_results( "SELECT $column, meta_key, meta_value FROM $table WHERE $column IN ($id_list) ORDER BY $id_column ASC", ARRAY_A );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta_list ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,7 +1047,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the meta key is considered protected.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_protected_meta( $meta_key, $meta_type = '' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $protected = ( '_' == $meta_key[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $protected = ( '_' === $meta_key[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"> * Filters whether a meta key is considered protected.
</span></span></pre></div>
<a id="trunksrcwpincludesmsblogsphp"></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-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-blogs.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> if ( false !== $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $blog;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'www.' === substr( $fields['domain'], 0, 4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nowww = substr( $fields['domain'], 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) AND path = %s ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'], $fields['path'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $blog ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $blog;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $fields['domain'], 0, 4 ) == 'www.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'www.' === substr( $fields['domain'], 0, 4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $nowww = substr( $fields['domain'], 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $blog = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->blogs WHERE domain IN (%s,%s) ORDER BY CHAR_LENGTH(domain) DESC", $nowww, $fields['domain'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +784,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 ( 'publish' != $new_status && 'publish' != $old_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' !== $new_status && 'publish' !== $old_status ) {
</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">@@ -809,7 +809,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 ( 'publish' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' !== $post->post_status ) {
</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="trunksrcwpincludesmsdefaultconstantsphp"></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-default-constants.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-default-constants.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-default-constants.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -36,7 +36,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'UPLOADS', UPLOADBLOGSDIR . '/' . $site_id . '/files/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Uploads dir relative to ABSPATH.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'wp-content/blogs.dir' == UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'wp-content/blogs.dir' === UPLOADBLOGSDIR && ! defined( 'BLOGUPLOADDIR' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . '/blogs.dir/' . $site_id . '/files/' );
</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">@@ -155,7 +155,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'SUBDOMAIN_INSTALL' ) && defined( 'VHOST' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( SUBDOMAIN_INSTALL !== ( 'yes' == VHOST ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( SUBDOMAIN_INSTALL !== ( 'yes' === VHOST ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $subdomain_error_warn = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( defined( 'SUBDOMAIN_INSTALL' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +163,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'VHOST', SUBDOMAIN_INSTALL ? 'yes' : 'no' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( defined( 'VHOST' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_error = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'SUBDOMAIN_INSTALL', 'yes' == VHOST );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'SUBDOMAIN_INSTALL', 'yes' === VHOST );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdomain_error = false;
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SUBDOMAIN_INSTALL', false );
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></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-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-deprecated.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $num == 'all' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'all' === $num ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array_slice( $blog_list, $start, count( $blog_list ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return array_slice( $blog_list, $start, $num );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,7 +293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['redirect'] ) && isset( $_POST['redirect'] ) && $_GET['redirect'] !== $_POST['redirect'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'A variable mismatch has been detected.' ), __( 'Sorry, you are not allowed to view this item.' ), 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_GET['redirect'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $_GET['redirect'], 0, 2 ) == 's_' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 's_' === substr( $_GET['redirect'], 0, 2 ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $url .= '&action=blogs&s='. esc_html( substr( $_GET['redirect'], 2 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_POST['redirect'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = wpmu_admin_redirect_add_updated_param( $_POST['redirect'] );
</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"> $blogname = substr( $domain, 0, strpos( $domain, '.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://' . substr( $domain, strpos( $domain, '.' ) + 1 ) . $path;
</span><span class="cx" style="display: block; padding: 0 10px"> // We're not installing the main blog.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $blogname != 'www.' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'www.' !== $blogname )
</ins><span class="cx" style="display: block; padding: 0 10px"> $url .= $blogname . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // Main blog.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = 'http://' . $domain . $path;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -718,7 +718,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $user = new WP_User( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> clean_user_cache( $user );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $pref == 'spam' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'spam' === $pref ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $value == 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/user.php */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'make_spam_user', $id );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-functions.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,11 +944,14 @@
</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"> $activate_url = esc_url( $activate_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
- if ( '' == $admin_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $admin_email = get_site_option( 'admin_email' );
+
+ 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $from_name = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_user_by( 'login', $user_login );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,10 +1073,12 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $from_name = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1224,7 +1229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * failed in between creating the blog and setting the activation flag.
</span><span class="cx" style="display: block; padding: 0 10px"> * Let's just set the active flag and instruct the user to reset their 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 ( 'blog_taken' == $blog_id->get_error_code() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'blog_taken' === $blog_id->get_error_code() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_id->add_data( $signup );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->signups,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1398,11 +1403,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $blog_id = $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">- if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'yes' !== get_site_option( 'registrationnotification' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $email = get_site_option( 'admin_email' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_email( $email ) == false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1458,7 +1464,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"> function newuser_notify_siteadmin( $user_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'yes' !== get_site_option( 'registrationnotification' ) ) {
</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">@@ -1632,13 +1638,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $meta Signup meta data. By default, contains the requested privacy setting and lang_id.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $admin_email = get_site_option( 'admin_email' );
</del><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">+ $admin_email = get_site_option( 'admin_email' );
+
+ 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1726,11 +1733,11 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $from_name = ( '' !== get_site_option( 'site_name' ) ) ? esc_html( get_site_option( 'site_name' ) ) : 'WordPress';
</ins><span class="cx" style="display: block; padding: 0 10px"> $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . 'Content-Type: text/plain; charset="' . get_option( 'blog_charset' ) . "\"\n";
</span><span class="cx" style="display: block; padding: 0 10px"> $message = $welcome_email;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1849,7 +1856,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 && false !== strpos( $ext_pattern, $ext ) ) {
</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">@@ -2119,7 +2126,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">@@ -2309,7 +2316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function force_ssl_content( $force = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $forced_content = 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 ( '' != $force ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $force ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $old_forced = $forced_content;
</span><span class="cx" style="display: block; padding: 0 10px"> $forced_content = $force;
</span><span class="cx" style="display: block; padding: 0 10px"> return $old_forced;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2594,7 +2601,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $network_id = get_current_network_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 ( 'users' == $using ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'users' === $using ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $count = get_user_count( $network_id );
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether the network is considered large.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2611,6 +2618,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"> $count = get_blog_count( $network_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/ms-functions.php */
</span><span class="cx" style="display: block; padding: 0 10px"> return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count, $network_id );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-load.php 2020-05-16 18:40:52 UTC (rev 47808)
</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 SUBDOMAIN_INSTALL;
</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 ( defined( 'VHOST' ) && VHOST == 'yes' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( defined( 'VHOST' ) && 'yes' === VHOST );
</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">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $active_plugins as $plugin ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! validate_file( $plugin ) // $plugin must validate as file.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && '.php' === substr( $plugin, -4 ) // $plugin must end with '.php'.
</ins><span class="cx" style="display: block; padding: 0 10px"> && file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist.
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,7 +499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $msg .= ' ' . __( 'If you’re still stuck with this message, then check that your database contains the following tables:' ) . '</p><ul>';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wpdb->tables( 'global' ) as $t => $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'sitecategories' == $t ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'sitecategories' === $t ) {
</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"> $msg .= '<li>' . $table . '</li>';
</span></span></pre></div>
<a id="trunksrcwpincludesmssettingsphp"></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-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-settings.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/ms-settings.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,10 +55,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $current_site ) || ! isset( $current_blog ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $domain, -3 ) == ':80' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ':80' === substr( $domain, -3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $domain = substr( $domain, 0, -3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( substr( $domain, -4 ) == ':443' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ':443' === substr( $domain, -4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $domain = substr( $domain, 0, -4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/nav-menu-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,7 +392,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 menu item corresponds to a taxonomy term for the currently queried non-hierarchical post object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_query->is_singular && 'taxonomy' == $menu_item->type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_query->is_singular && 'taxonomy' === $menu_item->type
</ins><span class="cx" style="display: block; padding: 0 10px"> && in_array( (int) $menu_item->object_id, $possible_object_parents, true )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $active_parent_object_ids[] = (int) $menu_item->object_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,9 +403,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->object_id == $queried_object_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">- ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && $wp_query->is_home && $home_page_id == $menu_item->object_id )
- || ( 'post_type' == $menu_item->type && $wp_query->is_singular )
- || ( 'taxonomy' == $menu_item->type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( ! empty( $home_page_id ) && 'post_type' === $menu_item->type
+ && $wp_query->is_home && $home_page_id == $menu_item->object_id )
+ || ( 'post_type' === $menu_item->type && $wp_query->is_singular )
+ || ( 'taxonomy' === $menu_item->type
</ins><span class="cx" style="display: block; padding: 0 10px"> && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax )
</span><span class="cx" style="display: block; padding: 0 10px"> && $queried_object->taxonomy == $menu_item->object )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,7 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $active_ancestor_item_ids[] = $_anc_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_type' == $menu_item->type && 'page' == $menu_item->object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_type' === $menu_item->type && 'page' === $menu_item->object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back compat classes for pages to match wp_page_menu().
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'page_item';
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'page-item-' . $menu_item->object_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -434,7 +435,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the menu item corresponds to the currently queried post type archive.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type_archive' == $menu_item->type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type_archive' === $menu_item->type
</ins><span class="cx" style="display: block; padding: 0 10px"> && is_post_type_archive( array( $menu_item->object ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current-menu-item';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +452,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $active_parent_item_ids[] = (int) $menu_item->menu_item_parent;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the menu item corresponds to the currently requested URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'custom' == $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'custom' === $menu_item->object && isset( $_SERVER['HTTP_HOST'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_root_relative_current = untrailingslashit( $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's the customize page then it will strip the query var off the URL before entering the comparison block.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -504,7 +505,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"> // Back-compat with wp_page_menu(): add "current_page_parent" to static home page link for any non-page query.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $home_page_id ) && 'post_type' == $menu_item->type && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $home_page_id ) && 'post_type' === $menu_item->type
+ && empty( $wp_query->is_page ) && $home_page_id == $menu_item->object_id
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = '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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && (
</span><span class="cx" style="display: block; padding: 0 10px"> // Ancestral post object.
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_type' == $parent_item->type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' === $parent_item->type
</ins><span class="cx" style="display: block; padding: 0 10px"> && ! empty( $queried_object->post_type )
</span><span class="cx" style="display: block; padding: 0 10px"> && is_post_type_hierarchical( $queried_object->post_type )
</span><span class="cx" style="display: block; padding: 0 10px"> && in_array( (int) $parent_item->object_id, $queried_object->ancestors, true )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -534,7 +537,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Ancestral term.
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxonomy' == $parent_item->type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' === $parent_item->type
</ins><span class="cx" style="display: block; padding: 0 10px"> && isset( $possible_taxonomy_ancestors[ $parent_item->object ] )
</span><span class="cx" style="display: block; padding: 0 10px"> && in_array( (int) $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ], true )
</span><span class="cx" style="display: block; padding: 0 10px"> && (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -565,7 +568,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current-' . $active_object . '-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 ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_type' === $parent_item->type && 'page' === $parent_item->object ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back compat classes for pages to match wp_page_menu().
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'current-menu-parent', $classes, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current_page_parent';
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/nav-menu.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $menu_obj &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! is_wp_error( $menu_obj ) &&
</span><span class="cx" style="display: block; padding: 0 10px"> ! empty( $menu_obj->taxonomy ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'nav_menu' == $menu_obj->taxonomy
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'nav_menu' === $menu_obj->taxonomy
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,7 +235,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the given ID is that of a nav menu item.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_nav_menu_item( $menu_item_id = 0 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( ! is_wp_error( $menu_item_id ) && ( 'nav_menu_item' == get_post_type( $menu_item_id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( ! is_wp_error( $menu_item_id ) && ( 'nav_menu_item' === get_post_type( $menu_item_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">@@ -476,15 +476,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-url'] = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'taxonomy' == $args['menu-item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'taxonomy' === $args['menu-item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_parent = get_term_field( 'parent', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = get_term_field( 'name', $args['menu-item-object-id'], $args['menu-item-object'], 'raw' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_type' == $args['menu-item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type' === $args['menu-item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post( $args['menu-item-object-id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $original_parent = (int) $original_object->post_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->post_title;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'post_type_archive' == $args['menu-item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' === $args['menu-item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $original_object = get_post_type_object( $args['menu-item-object'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $original_object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $original_title = $original_object->labels->archives;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,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"> // Hack to get wp to create a post object when too many properties are empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $args['menu-item-title'] && '' == $args['menu-item-description'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $args['menu-item-title'] && '' === $args['menu-item-description'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-description'] = ' ';
</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">@@ -517,7 +517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // New menu item. Default is draft status.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post['ID'] = 0;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post['post_status'] = 'publish' == $args['menu-item-status'] ? 'publish' : 'draft';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post['post_status'] = 'publish' === $args['menu-item-status'] ? 'publish' : 'draft';
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_item_db_id = wp_insert_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $menu_item_db_id || is_wp_error( $menu_item_db_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $menu_item_db_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -543,7 +543,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $menu_item_db_id, array( $menu->term_id ), 'nav_menu' );
</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 ( 'custom' == $args['menu-item-type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'custom' === $args['menu-item-type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-object-id'] = $menu_item_db_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $args['menu-item-object'] = 'custom';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -571,7 +571,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Update existing menu item. Default is publish status.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post['ID'] = $menu_item_db_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post['post_status'] = 'draft' == $args['menu-item-status'] ? 'draft' : 'publish';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post['post_status'] = ( 'draft' === $args['menu-item-status'] ) ? 'draft' : 'publish';
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_update_post( $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">@@ -711,9 +711,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $object = get_post_meta( $item->ID, '_menu_item_object', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = get_post_meta( $item->ID, '_menu_item_type', 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 ( 'post_type' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_type' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts[ $object ][] = $object_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'taxonomy' == $type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'taxonomy' === $type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms[ $object ][] = $object_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">@@ -806,7 +806,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_setup_nav_menu_item( $menu_item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_item->post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'nav_menu_item' == $menu_item->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'nav_menu_item' === $menu_item->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_item->db_id = (int) $menu_item->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->menu_item_parent = ! isset( $menu_item->menu_item_parent ) ? get_post_meta( $menu_item->ID, '_menu_item_menu_item_parent', true ) : $menu_item->menu_item_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->object_id = ! isset( $menu_item->object_id ) ? get_post_meta( $menu_item->ID, '_menu_item_object_id', true ) : $menu_item->object_id;
</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"> $menu_item->object = ! isset( $menu_item->object ) ? get_post_meta( $menu_item->ID, '_menu_item_object', true ) : $menu_item->object;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->type = ! isset( $menu_item->type ) ? get_post_meta( $menu_item->ID, '_menu_item_type', true ) : $menu_item->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 ( 'post_type' == $menu_item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_type' === $menu_item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object = get_post_type_object( $menu_item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->type_label = $object->labels->singular_name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -853,7 +853,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->title = ( '' === $menu_item->post_title ) ? $original_title : $menu_item->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">- } elseif ( 'post_type_archive' == $menu_item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'post_type_archive' === $menu_item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object = get_post_type_object( $menu_item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->title = ( '' === $menu_item->post_title ) ? $object->labels->archives : $menu_item->post_title;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -868,7 +868,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_description = ( '' === $post_content ) ? $post_type_description : $post_content;
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->url = get_post_type_archive_link( $menu_item->object );
</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 ( 'taxonomy' == $menu_item->type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'taxonomy' === $menu_item->type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $object = get_taxonomy( $menu_item->object );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item->type_label = $object->labels->singular_name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1013,13 +1013,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $menu_item->ID ) && is_nav_menu_item( $menu_item->ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_type = get_post_meta( $menu_item->ID, '_menu_item_type', true );
</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">- 'post_type' == $object_type &&
- 'post_type' == $menu_item_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' === $object_type &&
+ 'post_type' === $menu_item_type
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids[] = (int) $menu_item->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'taxonomy' == $object_type &&
- 'taxonomy' == $menu_item_type &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' === $object_type &&
+ 'taxonomy' === $menu_item_type &&
</ins><span class="cx" style="display: block; padding: 0 10px"> get_post_meta( $menu_item->ID, '_menu_item_object', true ) == $taxonomy
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_ids[] = (int) $menu_item->ID;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1079,7 +1079,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post $post The post object being transitioned from one status to another.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_auto_add_pages_to_menu( $new_status, $old_status, $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' != $new_status || 'publish' == $old_status || 'page' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' !== $new_status || 'publish' === $old_status || 'page' !== $post->post_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"> if ( ! empty( $post->post_parent ) ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/option.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,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 home is not set, use siteurl.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'home' == $option && '' == $value ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'home' === $option && '' === $value ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -508,7 +508,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_installing() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'yes' == $autoload ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'yes' === $autoload ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions( true );
</span><span class="cx" style="display: block; padding: 0 10px"> $alloptions[ $option ] = $serialized_value;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_set( 'alloptions', $alloptions, 'options' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -586,7 +586,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_installing() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'yes' == $row->autoload ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'yes' === $row->autoload ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alloptions = wp_load_alloptions( true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $alloptions ) && isset( $alloptions[ $option ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $alloptions[ $option ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2154,7 +2154,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_registered_settings = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'misc' == $option_group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'misc' === $option_group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2167,7 +2167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'general';
</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 ( 'privacy' == $option_group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'privacy' === $option_group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2207,7 +2207,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $new_whitelist_options, $wp_registered_settings;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'misc' == $option_group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'misc' === $option_group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.0.0',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2220,7 +2220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'general';
</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 ( 'privacy' == $option_group ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'privacy' === $option_group ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.5.0',
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/pluggable.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $from_email ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Get the site domain and get rid of www.
</span><span class="cx" style="display: block; padding: 0 10px"> $sitename = strtolower( $_SERVER['SERVER_NAME'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $sitename, 0, 4 ) == 'www.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'www.' === substr( $sitename, 0, 4 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sitename = substr( $sitename, 4 );
</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">@@ -432,7 +432,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->ContentType = $content_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set whether it's plaintext, depending on $content_type.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'text/html' == $content_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'text/html' === $content_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->isHTML( 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">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration = $cookie_elements['expiration'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow a grace period for POST and Ajax requests.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_doing_ajax() || 'POST' === $_SERVER['REQUEST_METHOD'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $expired += HOUR_IN_SECONDS;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1266,7 +1266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $location = wp_sanitize_redirect( $location );
</span><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_IIS && PHP_SAPI != 'cgi-fcgi' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $is_IIS && 'cgi-fcgi' !== PHP_SAPI ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> status_header( $status ); // This causes problems on IIS and some FastCGI setups.
</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">@@ -1414,7 +1414,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_validate_redirect( $location, $default = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $location = trim( $location, " \t\n\r\0\x08\x0B" );
</span><span class="cx" style="display: block; padding: 0 10px"> // Browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $location, 0, 2 ) == '//' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '//' === substr( $location, 0, 2 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = 'http:' . $location;
</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">@@ -1431,7 +1431,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"> // Allow only 'http' and 'https' schemes. No 'data:', etc.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $lp['scheme'] ) && ! ( 'http' == $lp['scheme'] || 'https' == $lp['scheme'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $lp['scheme'] ) && ! ( 'http' === $lp['scheme'] || 'https' === $lp['scheme'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -1646,14 +1646,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_email = 'wordpress@' . preg_replace( '#^www\.#', '', strtolower( $_SERVER['SERVER_NAME'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $comment->comment_author ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $comment->comment_author ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $from = "From: \"$blogname\" <$wp_email>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $comment->comment_author_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $comment->comment_author_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $reply_to = "Reply-To: $comment->comment_author_email";
</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"> $from = "From: \"$comment->comment_author\" <$wp_email>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $comment->comment_author_email ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $comment->comment_author_email ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_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">@@ -2271,7 +2271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $values['key'] = SECRET_KEY;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'auth' === $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $values['salt'] = SECRET_SALT;
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/pomo/mo.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $reader->setEndian( $endian_string );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $endian = ( 'big' == $endian_string ) ? 'N' : 'V';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $endian = ( 'big' === $endian_string ) ? 'N' : 'V';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $header = $reader->read( 24 );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $reader->strlen( $header ) != 24 ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/pomo/po.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $chars = $chars[0];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $chars as $char ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $previous_is_backslash ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '\\' == $char ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '\\' === $char ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $previous_is_backslash = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $unpoified .= $char;
</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">@@ -460,16 +460,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function read_line( $f, $action = 'read' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $last_line = '';
</span><span class="cx" style="display: block; padding: 0 10px"> static $use_last_line = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'clear' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'clear' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_line = '';
</span><span class="cx" style="display: block; padding: 0 10px"> return 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 ( 'put-back' == $action ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'put-back' === $action ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $use_last_line = true;
</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"> $line = $use_last_line ? $last_line : fgets( $f );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $line = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $line = ( "\r\n" === substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
</ins><span class="cx" style="display: block; padding: 0 10px"> $last_line = $line;
</span><span class="cx" style="display: block; padding: 0 10px"> $use_last_line = false;
</span><span class="cx" style="display: block; padding: 0 10px"> return $line;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,11 +482,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function add_comment_to_entry( &$entry, $po_comment_line ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $first_two = substr( $po_comment_line, 0, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = trim( substr( $po_comment_line, 2 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '#:' == $first_two ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '#:' === $first_two ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry->references = array_merge( $entry->references, preg_split( '/\s+/', $comment ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '#.' == $first_two ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '#.' === $first_two ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry->extracted_comments = trim( $entry->extracted_comments . "\n" . $comment );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( '#,' == $first_two ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( '#,' === $first_two ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $entry->flags = array_merge( $entry->flags, preg_split( '/,\s*/', $comment ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $entry->translator_comments = trim( $entry->translator_comments . "\n" . $comment );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,10 +498,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function trim_quotes( $s ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $s, 0, 1 ) == '"' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"' === substr( $s, 0, 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $s = substr( $s, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $s, -1, 1 ) == '"' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"' === substr( $s, -1, 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $s = substr( $s, 0, -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $s;
</span></span></pre></div>
<a id="trunksrcwpincludespomostreamsphp"></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/streams.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/streams.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/pomo/streams.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> if ( 4 != $this->strlen( $bytes ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 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">- $endian_letter = ( 'big' == $this->endian ) ? 'N' : 'V';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
</ins><span class="cx" style="display: block; padding: 0 10px"> $int = unpack( $endian_letter, $bytes );
</span><span class="cx" style="display: block; padding: 0 10px"> return reset( $int );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> if ( 4 * $count != $this->strlen( $bytes ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 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">- $endian_letter = ( 'big' == $this->endian ) ? 'N' : 'V';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $endian_letter = ( 'big' === $this->endian ) ? 'N' : 'V';
</ins><span class="cx" style="display: block; padding: 0 10px"> return unpack( $endian_letter . $count, $bytes );
</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="trunksrcwpincludespomotranslationsphp"></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/translations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/translations.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/pomo/translations.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,7 +287,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function set_header( $header, $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> parent::set_header( $header, $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'Plural-Forms' == $header ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'Plural-Forms' === $header ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $nplurals, $expression ) = $this->nplurals_and_expression_from_header( $this->get_header( 'Plural-Forms' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_nplurals = $nplurals;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->_gettext_select_plural_form = $this->make_plural_form_function( $nplurals, $expression );
</span></span></pre></div>
<a id="trunksrcwpincludespostformatsphp"></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-formats.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post-formats.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/post-formats.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -192,7 +192,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _post_format_link( $link, $term, $taxonomy ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_format' != $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_format' !== $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $link;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->get_extra_permastruct( $taxonomy ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -232,13 +232,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _post_format_get_terms( $terms, $taxonomies, $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( 'post_format', (array) $taxonomies, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['fields'] ) && 'names' === $args['fields'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $order => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $terms[ $order ] = get_post_format_string( str_replace( 'post-format-', '', $name ) );
</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"> foreach ( (array) $terms as $order => $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $term->taxonomy ) && 'post_format' === $term->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
</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">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _post_format_wp_get_object_terms( $terms ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $terms as $order => $term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $term->taxonomy ) && 'post_format' == $term->taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $term->taxonomy ) && 'post_format' === $term->taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms[ $order ]->name = get_post_format_string( str_replace( 'post-format-', '', $term->slug ) );
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/post-template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +139,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $protected_title_format = apply_filters( 'protected_title_format', $prepend, $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $protected_title_format, $title );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $post->post_status ) && 'private' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Private post title. */
</span><span class="cx" style="display: block; padding: 0 10px"> $prepend = __( 'Private: %s' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,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_tag' uses the 'tag' prefix for backward compatibility.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_tag' == $taxonomy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_tag' === $taxonomy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'tag-' . $term_class;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $output = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $multipage ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'number' == $parsed_args['next_or_number'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'number' === $parsed_args['next_or_number'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= $parsed_args['before'];
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1; $i <= $numpages; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $parsed_args['link_before'] . str_replace( '%', $i, $parsed_args['pagelink'] ) . $parsed_args['link_after'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1032,9 +1032,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 1 == $i ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_permalink();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == get_option( 'permalink_structure' ) || in_array( $post->post_status, array( 'draft', 'pending' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! get_option( 'permalink_structure' ) || in_array( $post->post_status, array( 'draft', 'pending' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = add_query_arg( 'page', $i, get_permalink() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'page' === get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( get_permalink() ) . user_trailingslashit( "$wp_rewrite->pagination_base/" . $i, 'single_paged' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( get_permalink() ) . user_trailingslashit( $i, 'single_paged' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1436,7 +1436,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
</span><span class="cx" style="display: block; padding: 0 10px"> // If the front page is a page, add it to the exclude list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( get_option( 'show_on_front' ) == 'page' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'page' === get_option( 'show_on_front' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $list_args['exclude'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $list_args['exclude'] .= ',';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1612,7 +1612,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $text ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_text = $text;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $size && 'none' != $size ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $size && 'none' !== $size ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $link_text = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1789,7 +1789,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $template = get_post_meta( $post->ID, '_wp_page_template', 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 ( ! $template || 'default' == $template ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $template || 'default' === $template ) {
</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="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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/post.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,7 +769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post->filter ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = sanitize_post( $post, 'raw' );
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = new WP_Post( $_post );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'raw' == $post->filter ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'raw' === $post->filter ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post = new WP_Post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = WP_Post::get_instance( $post->ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -899,13 +899,13 @@
</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 ( 'attachment' == $post->post_type ) {
- if ( 'private' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post->post_type ) {
+ if ( 'private' === $post->post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 'private';
</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"> // Unattached attachments are assumed to be published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'inherit' === $post->post_status ) && ( 0 == $post->post_parent ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return '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">@@ -912,7 +912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Inherit status from the parent.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_post_status = get_post_status( $post->post_parent );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'trash' == $parent_post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'trash' === $parent_post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent_post_status;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1160,7 +1160,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_statuses;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = ( 'names' == $output ) ? 'name' : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = ( 'names' === $output ) ? 'name' : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_filter_object_list( $wp_post_statuses, $args, $operator, $field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1265,7 +1265,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_post_types;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $field = ( 'names' == $output ) ? 'name' : false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $field = ( 'names' === $output ) ? 'name' : false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_filter_object_list( $wp_post_types, $args, $operator, $field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2027,7 +2027,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $parsed_args['post_status'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['post_status'] = ( 'attachment' == $parsed_args['post_type'] ) ? 'inherit' : 'publish';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['post_status'] = ( 'attachment' === $parsed_args['post_type'] ) ? 'inherit' : 'publish';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $parsed_args['numberposts'] ) && empty( $parsed_args['posts_per_page'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['posts_per_page'] = $parsed_args['numberposts'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2381,7 +2381,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'raw' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'raw' === $context ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2391,7 +2391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $field_no_prefix = str_replace( 'post_', '', $field );
</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 ( 'edit' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $format_to_edit = array( 'post_content', 'post_excerpt', 'post_title', 'post_password' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2426,7 +2426,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 ( in_array( $field, $format_to_edit, true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post_content' == $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post_content' === $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = format_to_edit( $value, user_can_richedit() );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = format_to_edit( $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2434,7 +2434,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $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">- } elseif ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</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">@@ -2499,9 +2499,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "post_{$field}", $value, $post_id, $context );
</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 ( 'attribute' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attribute' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'js' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'js' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_js( $value );
</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">@@ -2602,12 +2602,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _count_posts_cache_key( $type = 'post', $perm = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key = 'posts-' . $type;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'readable' == $perm && is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'readable' === $perm && is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $type );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_key .= '_' . $perm . '_' . get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $cache_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">@@ -2646,7 +2649,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'readable' == $perm && is_user_logged_in() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( 'readable' === $perm && is_user_logged_in() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_object = get_post_type_object( $type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query .= $wpdb->prepare(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2655,6 +2659,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $query .= ' GROUP BY post_status';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3114,7 +3119,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _reset_front_page_settings_for_post( $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'page' == $post->post_type ) {
</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"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * If the page is defined in option page_on_front or post_for_posts,
</span><span class="cx" style="display: block; padding: 0 10px"> * adjust the corresponding options.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3127,6 +3133,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'page_for_posts', 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> unstick_post( $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">@@ -3381,7 +3388,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $group_by_status as $status => $comments ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Sanity check. This shouldn't happen.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post-trashed' == $status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post-trashed' === $status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_in = implode( ', ', array_map( 'intval', $comments ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3704,7 +3711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure we set a valid category.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'post' requires at least one category.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type && 'auto-draft' !== $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_category = array( get_option( 'default_category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_category = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3748,8 +3755,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If the post date is empty (due to having been new or a draft) and status
</span><span class="cx" style="display: block; padding: 0 10px"> * is not 'draft' or 'pending', set date to now.
</span><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( $postarr['post_date'] ) || '0000-00-00 00:00:00' == $postarr['post_date'] ) {
- if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $postarr['post_date'] ) || '0000-00-00 00:00:00' === $postarr['post_date'] ) {
+ if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' === $postarr['post_date_gmt'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_date = current_time( 'mysql' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date = get_date_from_gmt( $postarr['post_date_gmt'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3771,7 +3778,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( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' === $postarr['post_date_gmt'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! in_array( $post_status, get_post_stati( array( 'date_floating' => true ) ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = get_gmt_from_date( $post_date );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3781,7 +3788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_date_gmt = $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 ( $update || '0000-00-00 00:00:00' == $post_date ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $update || '0000-00-00 00:00:00' === $post_date ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_modified = current_time( 'mysql' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_modified_gmt = current_time( 'mysql', 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3833,7 +3840,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_password = isset( $postarr['post_password'] ) ? $postarr['post_password'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'private' == $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'private' === $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_password = '';
</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">@@ -4027,7 +4034,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_guid = get_post_field( 'guid', $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Set GUID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $update && '' == $current_guid ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $update && '' === $current_guid ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
</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">@@ -4069,7 +4076,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $postarr['page_template'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post->page_template = $postarr['page_template'];
</span><span class="cx" style="display: block; padding: 0 10px"> $page_templates = wp_get_theme()->get_page_templates( $post );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'default' !== $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_page_template', __( 'Invalid page template.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4239,7 +4246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Drafts shouldn't be assigned a date unless explicitly done so by the user.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post['post_status'] )
</span><span class="cx" style="display: block; padding: 0 10px"> && in_array( $post['post_status'], array( 'draft', 'pending', 'auto-draft' ), true )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && empty( $postarr['edit_date'] ) && ( '0000-00-00 00:00:00' == $post['post_date_gmt'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && empty( $postarr['edit_date'] ) && ( '0000-00-00 00:00:00' === $post['post_date_gmt'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $clear_date = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4292,7 +4299,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 ( 'publish' == $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status ) {
</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">@@ -4337,7 +4344,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 ( 'future' != $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'future' !== $post->post_status ) {
</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">@@ -4371,7 +4378,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ), true )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || ( 'inherit' == $post_status && 'revision' == $post_type ) || 'user_request' === $post_type
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || ( 'inherit' === $post_status && 'revision' === $post_type ) || 'user_request' === $post_type
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $slug;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4405,7 +4412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $feeds = array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Attachment slugs must be unique across all types.
</span><span class="cx" style="display: block; padding: 0 10px"> $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
</span><span class="cx" style="display: block; padding: 0 10px"> $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4433,7 +4440,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $alt_post_name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_post_type_hierarchical( $post_type ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'nav_menu_item' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'nav_menu_item' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $slug;
</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">@@ -4671,13 +4678,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If $post_categories isn't already an array, make it one:
</span><span class="cx" style="display: block; padding: 0 10px"> $post_categories = (array) $post_categories;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_categories ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'post' === $post_type && 'auto-draft' !== $post_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_categories = array( get_option( 'default_category' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $append = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_categories = 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">- } elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 1 == count( $post_categories ) && '' === reset( $post_categories ) ) {
</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">@@ -4816,7 +4823,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 ( $custom_fields as $key => $val ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'enclosure' != $key || ! is_array( $val ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'enclosure' !== $key || ! is_array( $val ) ) {
</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"> foreach ( $val as $enc ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5395,13 +5402,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_author = $post_author->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 ( '' == $author_query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $author_query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_query = $wpdb->prepare( ' post_author = %d ', $post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $author_query .= $wpdb->prepare( ' OR post_author = %d ', $post_author );
</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 ( '' != $author_query ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $author_query ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $author_query = " AND ($author_query)";
</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">@@ -5593,7 +5600,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $id = url_to_postid( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'attachment' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $post->post_type ) {
</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">@@ -5925,7 +5932,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 ( 'attachment' != $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' !== $post->post_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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6239,7 +6246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $dh ) {
</span><span class="cx" style="display: block; padding: 0 10px"> while ( false !== $file = readdir( $dh ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $file = wp_basename( $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( substr( $file, 0, 1 ) == '.' ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === substr( $file, 0, 1 ) ) {
</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">@@ -6701,7 +6708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'clean_post_cache', $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 ( 'page' == $post->post_type ) {
</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"> wp_cache_delete( 'all_page_ids', 'posts' );
</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">@@ -6747,7 +6754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $update_term_cache ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $post_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptypes = $post_type;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'any' == $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'any' === $post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptypes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> // Just use the post_types in the supplied posts.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $posts as $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6847,7 +6854,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'publish' !== $old_status && 'publish' === $new_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Reset GUID if transitioning to publish and it is empty.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == get_the_guid( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === get_the_guid( $post->ID ) ) {
</ins><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 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">@@ -6863,7 +6870,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 published posts changed clear the lastpostmodified cache.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' == $new_status || 'publish' == $old_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $new_status || 'publish' === $old_status ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/revision.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,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 ( 'auto-draft' == $post->post_status ) {
</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"> 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">@@ -308,7 +308,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_post', __( 'Invalid 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 ( isset( $post['post_type'] ) && 'revision' == $post['post_type'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post['post_type'] ) && 'revision' === $post['post_type'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
</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">@@ -616,11 +616,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</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( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id
+ || 'post_format' !== $taxonomy || 'revision' === $post->post_type
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $terms;
</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 ( 'standard' == $_REQUEST['post_format'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'standard' === $_REQUEST['post_format'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,8 +654,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_REQUEST['_thumbnail_id'] ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> empty( $_REQUEST['preview_id'] ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> $post->ID != $post_id ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '_thumbnail_id' != $meta_key ||
- 'revision' == $post->post_type ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '_thumbnail_id' !== $meta_key ||
+ 'revision' === $post->post_type ||
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_id != $_REQUEST['preview_id'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/rewrite.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,7 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '://www.', '://', $url );
</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 ( trim( $url, '/' ) === home_url() && 'page' == get_option( 'show_on_front' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( trim( $url, '/' ) === home_url() && 'page' === get_option( 'show_on_front' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_on_front = get_option( 'page_on_front' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $page_on_front && get_post( $page_on_front ) instanceof WP_Post ) {
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/shortcodes.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> function add_shortcode( $tag, $callback ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == trim( $tag ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === trim( $tag ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Invalid shortcode name: Empty name given.' );
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong( __FUNCTION__, $message, '4.4.0' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,7 +386,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $textarr = wp_html_split( $content );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $textarr as &$element ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' == $element || '<' !== $element[0] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $element || '<' !== $element[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">@@ -511,8 +511,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $text
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array|string List of attribute values.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Returns empty array if trim( $text ) == '""'.
- * Returns empty string if trim( $text ) == ''.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns empty array if '""' === trim( $text ).
+ * Returns empty string if '' === trim( $text ).
</ins><span class="cx" style="display: block; padding: 0 10px"> * All other matches are checked for not empty().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function shortcode_parse_atts( $text ) {
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/template.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +668,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 ( $load && '' != $located ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $load && '' !== $located ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> load_template( $located, $require_once );
</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="trunksrcwpincludesthemecompatcommentsphp"></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-compat/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/comments.php 2020-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/theme-compat/comments.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,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 delete these lines.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $_SERVER['SCRIPT_FILENAME'] ) && 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_SERVER['SCRIPT_FILENAME'] ) && 'comments.php' === basename( $_SERVER['SCRIPT_FILENAME'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> die( 'Please do not load this page directly. Thanks!' );
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/theme.php 2020-05-16 18:40:52 UTC (rev 47808)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1156,7 +1156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function get_header_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'remove-header' == $url ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'remove-header' === $url ) {
</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">@@ -1265,10 +1265,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_mod = get_theme_mod( 'header_image', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'random-uploaded-image' == $header_image_mod ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'random-uploaded-image' === $header_image_mod ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = get_uploaded_header_images();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_wp_default_headers ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'random-default-image' == $header_image_mod ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'random-default-image' === $header_image_mod ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = $_wp_default_headers;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'custom-header', 'random-default' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1286,6 +1286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_random_header->url = sprintf( $_wp_random_header->url, get_template_directory_uri(), get_stylesheet_directory_uri() );
</span><span class="cx" style="display: block; padding: 0 10px"> $_wp_random_header->thumbnail_url = sprintf( $_wp_random_header->thumbnail_url, get_template_directory_uri(), get_stylesheet_directory_uri() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $_wp_random_header;
</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">@@ -1298,9 +1299,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_random_header_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> $random_image = _get_random_header_data();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $random_image->url ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $random_image->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">@@ -1319,14 +1322,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function is_random_header_image( $type = 'any' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $header_image_mod = get_theme_mod( 'header_image', get_theme_support( 'custom-header', 'default-image' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'any' == $type ) {
- if ( 'random-default-image' == $header_image_mod || 'random-uploaded-image' == $header_image_mod || ( '' != get_random_header_image() && empty( $header_image_mod ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'any' === $type ) {
+ if ( 'random-default-image' === $header_image_mod
+ || 'random-uploaded-image' === $header_image_mod
+ || ( '' !== get_random_header_image() && empty( $header_image_mod ) )
+ ) {
</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"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( "random-$type-image" == $header_image_mod ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( "random-$type-image" === $header_image_mod ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'default' == $type && empty( $header_image_mod ) && '' != get_random_header_image() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'default' === $type && empty( $header_image_mod ) && '' !== get_random_header_image() ) {
</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">@@ -1341,6 +1347,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function header_image() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = get_header_image();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $image ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_url( $image );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1536,6 +1543,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function the_header_video_url() {
</span><span class="cx" style="display: block; padding: 0 10px"> $video = get_header_video_url();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $video ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo esc_url( $video );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2903,7 +2911,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function current_theme_supports( $feature, ...$args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_wp_theme_features;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'custom-header-uploads' == $feature ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'custom-header-uploads' === $feature ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return current_theme_supports( 'custom-header', 'uploads' );
</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">@@ -3074,11 +3082,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_customize_include() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_customize_admin_page = ( is_admin() && 'customize.php' == basename( $_SERVER['PHP_SELF'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_customize_admin_page = ( is_admin() && 'customize.php' === basename( $_SERVER['PHP_SELF'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $should_include = (
</span><span class="cx" style="display: block; padding: 0 10px"> $is_customize_admin_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">- ( isset( $_REQUEST['wp_customize'] ) && 'on' == $_REQUEST['wp_customize'] )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( isset( $_REQUEST['wp_customize'] ) && 'on' === $_REQUEST['wp_customize'] )
</ins><span class="cx" style="display: block; padding: 0 10px"> ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( ! empty( $_GET['customize_changeset_uuid'] ) || ! empty( $_POST['customize_changeset_uuid'] ) )
</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-05-16 17:23:31 UTC (rev 47807)
+++ trunk/src/wp-includes/user.php 2020-05-16 18:40:52 UTC (rev 47808)
</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"> $blog_prefix = $wpdb->get_blog_prefix( $site_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $result = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'time' == $strategy ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'time' === $strategy ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && get_current_blog_id() != $site_id ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1251,7 +1251,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = (int) $value;
</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 ( 'raw' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'raw' === $context ) {
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1261,7 +1261,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $prefixed = false !== strpos( $field, 'user_' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'edit' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'edit' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1282,12 +1282,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "edit_user_{$field}", $value, $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 ( 'description' == $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'description' === $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_html( $value ); // textarea_escaped?
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $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">- } elseif ( 'db' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'db' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/post.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "pre_{$field}", $value );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,13 +1329,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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'user_url' == $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'user_url' === $field ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_url( $value );
</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 ( 'attribute' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attribute' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_attr( $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( 'js' == $context ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( 'js' === $context ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = esc_js( $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2506,7 +2506,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">@@ -2523,7 +2523,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></pre>
</div>
</div>
</body>
</html>