<!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>[47550] trunk/src: Coding Standards: Use strict type check for `in_array()` and `array_search()` where 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/47550">47550</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/47550","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-04-05 03:00:44 +0000 (Sun, 05 Apr 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 type check for `in_array()` and `array_search()` where strings are involved.
This reduces the number of `WordPress.PHP.StrictInArray.MissingTrueStrict` issues from 486 to 50.
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="#trunksrcwpactivatephp">trunk/src/wp-activate.php</a></li>
<li><a href="#trunksrcwpadminadminajaxphp">trunk/src/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.php</a></li>
<li><a href="#trunksrcwpadminedittagsphp">trunk/src/wp-admin/edit-tags.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustombackgroundphp">trunk/src/wp-admin/includes/class-custom-background.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkercategorychecklistphp">trunk/src/wp-admin/includes/class-walker-category-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommentslisttablephp">trunk/src/wp-admin/includes/class-wp-comments-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpcommunityeventsphp">trunk/src/wp-admin/includes/class-wp-community-events.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsuserslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpplugininstalllisttablephp">trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesclasswpscreenphp">trunk/src/wp-admin/includes/class-wp-screen.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswptermslisttablephp">trunk/src/wp-admin/includes/class-wp-terms-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeinstalllisttablephp">trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderphp">trunk/src/wp-admin/includes/class-wp-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesnetworkphp">trunk/src/wp-admin/includes/network.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="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludestranslationinstallphp">trunk/src/wp-admin/includes/translation-install.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatecorephp">trunk/src/wp-admin/includes/update-core.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminincludeswidgetsphp">trunk/src/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunksrcwpadminloadscriptsphp">trunk/src/wp-admin/load-scripts.php</a></li>
<li><a href="#trunksrcwpadminloadstylesphp">trunk/src/wp-admin/load-styles.php</a></li>
<li><a href="#trunksrcwpadminmenuphp">trunk/src/wp-admin/menu.php</a></li>
<li><a href="#trunksrcwpadminmysitesphp">trunk/src/wp-admin/my-sites.php</a></li>
<li><a href="#trunksrcwpadminnetworksettingsphp">trunk/src/wp-admin/network/settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitenewphp">trunk/src/wp-admin/network/site-new.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworkupdatephp">trunk/src/wp-admin/network/update.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
<li><a href="#trunksrcwpadminoptionsreadingphp">trunk/src/wp-admin/options-reading.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="#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="#trunksrcwpadmintermphp">trunk/src/wp-admin/term.php</a></li>
<li><a href="#trunksrcwpadminthemeeditorphp">trunk/src/wp-admin/theme-editor.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="#trunksrcwpcontentthemestwentyelevenincthemeoptionsphp">trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfifteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentasidephp">trunk/src/wp-content/themes/twentyfourteen/content-aside.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentaudiophp">trunk/src/wp-content/themes/twentyfourteen/content-audio.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentfeaturedpostphp">trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentgalleryphp">trunk/src/wp-content/themes/twentyfourteen/content-gallery.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentimagephp">trunk/src/wp-content/themes/twentyfourteen/content-image.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentlinkphp">trunk/src/wp-content/themes/twentyfourteen/content-link.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentquotephp">trunk/src/wp-content/themes/twentyfourteen/content-quote.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteencontentvideophp">trunk/src/wp-content/themes/twentyfourteen/content-video.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="#trunksrcwpcontentthemestwentyfourteeninccustomizerphp">trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincfeaturedcontentphp">trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteenincwidgetsphp">trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp">trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentysixteeninctemplatetagsphp">trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwelvefunctionsphp">trunk/src/wp-content/themes/twentytwelve/functions.php</a></li>
<li><a href="#trunksrcwpincludesauthortemplatephp">trunk/src/wp-includes/author-template.php</a></li>
<li><a href="#trunksrcwpincludesbookmarkphp">trunk/src/wp-includes/bookmark.php</a></li>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.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="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentphp">trunk/src/wp-includes/class-wp-comment.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesclasswpdatequeryphp">trunk/src/wp-includes/class-wp-date-query.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="#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="#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="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptextdiffrenderertablephp">trunk/src/wp-includes/class-wp-text-diff-renderer-table.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="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescompatphp">trunk/src/wp-includes/compat.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizemediacontrolphp">trunk/src/wp-includes/customize/class-wp-customize-media-control.php</a></li>
<li><a href="#trunksrcwpincludesembedphp">trunk/src/wp-includes/embed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesfunctionswpscriptsphp">trunk/src/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludesl10nphp">trunk/src/wp-includes/l10n.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesloadphp">trunk/src/wp-includes/load.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesnavmenutemplatephp">trunk/src/wp-includes/nav-menu-template.php</a></li>
<li><a href="#trunksrcwpincludesoptionphp">trunk/src/wp-includes/option.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.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="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesthemephp">trunk/src/wp-includes/theme.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetlinksphp">trunk/src/wp-includes/widgets/class-wp-widget-links.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetpagesphp">trunk/src/wp-includes/widgets/class-wp-widget-pages.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetrssphp">trunk/src/wp-includes/widgets/class-wp-widget-rss.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpactivatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-activate.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-activate.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-activate.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> } elseif ( is_wp_error( $result ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $error_code = $result->get_error_code();
</span><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_array( $error_code, $valid_error_codes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $error_code, $valid_error_codes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> status_header( 400 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $result ) && in_array( $result->get_error_code(), $valid_error_codes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $signup = $result->get_error_data();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2><?php _e( 'Your account is now active!' ); ?></h2>
</span></span></pre></div>
<a id="trunksrcwpadminadminajaxphp"></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-ajax.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-ajax.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/admin-ajax.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $core_actions_post = array_merge( $core_actions_post, $core_actions_post_deprecated );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Register core Ajax calls.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['action'] ) && in_array( $_GET['action'], $core_actions_get, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_' . $_GET['action'], 'wp_ajax_' . str_replace( '-', '_', $_GET['action'] ), 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 ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_POST['action'] ) && in_array( $_POST['action'], $core_actions_post, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_ajax_' . $_POST['action'], 'wp_ajax_' . str_replace( '-', '_', $_POST['action'] ), 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmincommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/comment.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/comment.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -255,7 +255,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'unapprovecomment':
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id = absint( $_REQUEST['c'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'approve-comment_' . $comment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'delete-comment_' . $comment_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redir = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( '' != wp_get_original_referer() && ! $noredir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redir = wp_get_original_referer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $action, array( 'approvecomment', 'unapprovecomment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redir = admin_url( 'edit-comments.php?p=' . absint( $comment->comment_post_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $redir = admin_url( 'edit-comments.php' );
</span></span></pre></div>
<a id="trunksrcwpadminedittagsphp"></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-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-tags.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/edit-tags.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> wp_die( __( 'Invalid taxonomy.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
</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="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/edit.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> wp_die( __( 'Invalid 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 ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit posts in this 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -976,7 +976,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "approve-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 ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $current, array( 'unapproved', 'spam' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $result = wp_set_comment_status( $comment, 'approve', true );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $result = wp_set_comment_status( $comment, 'hold', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1271,7 +1271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post->post_status ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( 1 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post->post_status, array( 'draft', 'pending', 'trash' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Error: You are replying to a comment on a draft 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">@@ -2057,7 +2057,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: wp_unique_post_slug() doesn't work for drafts, so we will fake that our post is published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $data['post_name'] ) && in_array( $post['post_status'], array( 'draft', 'pending' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $data['post_name'] ) && in_array( $post['post_status'], array( 'draft', 'pending' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post['post_status'] = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $data['post_name'] = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2525,7 +2525,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 context is custom header or background, make sure the uploaded file is an image.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2852,7 +2852,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', 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 ( in_array( $pointer, $dismissed ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $pointer, $dismissed, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( 0 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustombackgroundphp"></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-background.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-background.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-custom-background.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -601,7 +601,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"> $size = 'thumbnail';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $_POST['size'], $sizes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $_POST['size'], $sizes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $size = esc_attr( $_POST['size'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscustomimageheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-custom-image-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-custom-image-header.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1097,7 +1097,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 ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> set_theme_mod( 'header_image', $choice );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_theme_mod( 'header_image_data' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswalkercategorychecklistphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-category-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-category-checklist.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-walker-category-checklist.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,8 +82,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"> $args['popular_cats'] = empty( $args['popular_cats'] ) ? array() : $args['popular_cats'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $class = in_array( $category->term_id, $args['popular_cats'] ) ? ' class="popular-category"' : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['selected_cats'] = empty( $args['selected_cats'] ) ? array() : $args['selected_cats'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args['list_only'] ) ) {
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $send = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_failures = array( 'incompatible_archive', 'download_failed', 'insane_distro', 'locked' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $error_code, $transient_failures ) && ! get_site_option( 'auto_core_update_failed' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $error_code, $transient_failures, true ) && ! get_site_option( 'auto_core_update_failed' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_schedule_single_event( time() + HOUR_IN_SECONDS, 'wp_maybe_auto_update' );
</span><span class="cx" style="display: block; padding: 0 10px"> $send = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_code' => $error_code,
</span><span class="cx" style="display: block; padding: 0 10px"> 'error_data' => $result->get_error_data(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'timestamp' => time(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'retry' => in_array( $error_code, $transient_failures ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'retry' => in_array( $error_code, $transient_failures, true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-comments-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,7 +87,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_id, $comment_status, $search, $comment_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_status = isset( $_REQUEST['comment_status'] ) ? $_REQUEST['comment_status'] : 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $comment_status, array( 'all', 'mine', 'moderated', 'approved', 'spam', 'trash' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $comment_status, array( 'all', 'mine', 'moderated', 'approved', 'spam', 'trash' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_status = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -344,13 +344,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $comment_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 ( in_array( $comment_status, array( 'all', 'approved' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $comment_status, array( 'all', 'approved' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['unapprove'] = __( 'Unapprove' );
</span><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_array( $comment_status, array( 'all', 'moderated' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $comment_status, array( 'all', 'moderated' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['approve'] = __( 'Approve' );
</span><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_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $comment_status, array( 'all', 'moderated', 'approved', 'trash' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['spam'] = _x( 'Mark as Spam', '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">@@ -360,7 +360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['unspam'] = _x( 'Not Spam', '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 ( in_array( $comment_status, array( 'trash', 'spam' ) ) || ! EMPTY_TRASH_DAYS ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $comment_status, array( 'trash', 'spam' ), true ) || ! EMPTY_TRASH_DAYS ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $actions['delete'] = __( 'Delete Permanently' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $actions['trash'] = __( 'Move to Trash' );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpcommunityeventsphp"></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-community-events.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-community-events.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-community-events.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $trimmed_event_types = wp_list_pluck( $response_body['events'], 'type' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the soonest upcoming WordCamp is pinned in the list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'wordcamp', $trimmed_event_types ) && $wordcamps ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'wordcamp', $trimmed_event_types, true ) && $wordcamps ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> array_pop( $response_body['events'] );
</span><span class="cx" style="display: block; padding: 0 10px"> array_push( $response_body['events'], $wordcamps[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</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 mixed Property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$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">@@ -196,7 +196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Newly-set property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __set( $name, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name = $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">@@ -210,7 +210,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->$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">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->$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">@@ -238,7 +238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed|bool Return value of the callback, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __call( $name, $arguments ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_methods ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_methods, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name( ...$arguments );
</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">@@ -1133,13 +1133,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column_key => $column_display_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class = array( 'manage-column', "column-$column_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 ( in_array( $column_key, $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column_key, $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $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="cx" style="display: block; padding: 0 10px"> if ( 'cb' === $column_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'check-column';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $column_key, array( 'posts', 'comments', 'links' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $class[] = 'num';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1329,7 +1329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' has-row-actions column-primary';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $column_name, $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column_name, $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' hidden';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $status = isset( $_REQUEST['theme_status'] ) ? $_REQUEST['theme_status'] : 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status, array( 'all', 'enabled', 'disabled', 'upgrade', 'search', 'broken' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $totals[ $type ] = count( $list );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $themes[ $status ] ) && ! in_array( $status, array( 'all', 'search' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -674,7 +674,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column_name => $column_display_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_classes = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $column_name, $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column_name, $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $extra_classes .= ' hidden';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-ms-users-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> echo $edit;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $user->user_login, $super_admins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $user->user_login, $super_admins, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo ' — ' . __( 'Super Admin' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpplugininstalllisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -136,7 +136,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonmenu_tabs = apply_filters( 'install_plugins_nonmenu_tabs', $nonmenu_tabs );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a non-valid menu tab has been selected, And it's not a non-menu action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs, true ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab = key( $tabs );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-plugins-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $status_whitelist = array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], array( 'active', 'inactive', 'recently_activated', 'upgrade', 'mustuse', 'dropins', 'search', 'paused' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['plugin_status'] ) && in_array( $_REQUEST['plugin_status'], $status_whitelist, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = $_REQUEST['plugin_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">@@ -243,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $totals[ $type ] = count( $list );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $plugins[ $status ] ) && ! in_array( $status, array( 'all', 'search' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $plugins[ $status ] ) && ! in_array( $status, array( 'all', 'search' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $status = 'all';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -398,7 +400,7 @@
</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"> return array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'cb' => ! in_array( $status, array( 'mustuse', 'dropins' ) ) ? '<input type="checkbox" />' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'cb' => ! in_array( $status, array( 'mustuse', 'dropins' ), true ) ? '<input type="checkbox" />' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'name' => __( 'Plugin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Description' ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function bulk_actions( $which = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $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 ( in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $status, array( 'mustuse', 'dropins' ), 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +558,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function extra_tablenav( $which ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $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 ( ! in_array( $status, array( 'recently_activated', 'mustuse', 'dropins' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status, array( 'recently_activated', 'mustuse', 'dropins' ), 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,7 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function display_rows() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $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 ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_multisite() && ! $this->screen->in_admin( 'network' ) && in_array( $status, array( 'mustuse', 'dropins' ), 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -831,7 +833,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $compatible_php = is_php_version_compatible( $requires_php );
</span><span class="cx" style="display: block; padding: 0 10px"> $class = $is_active ? 'active' : 'inactive';
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox_id = 'checkbox_' . md5( $plugin_data['Name'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ) ) || ! $compatible_php ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $restrict_network_active || $restrict_network_only || in_array( $status, array( 'mustuse', 'dropins' ), true ) || ! $compatible_php ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $checkbox = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $checkbox = sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -870,7 +872,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column_name => $column_display_name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $extra_classes = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $column_name, $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column_name, $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $extra_classes = ' hidden';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_counts = (array) wp_count_posts( $post_type, 'readable' );
</span><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['post_status'] ) && in_array( $_REQUEST['post_status'], $avail_post_stati ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'], $avail_post_stati, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $total_items = $post_counts[ $_REQUEST['post_status'] ];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $total_items = $this->sticky_posts_count;
</span><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">
</span><span class="cx" style="display: block; padding: 0 10px"> $status_name = $status->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 ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status_name, $avail_post_stati, true ) || empty( $num_posts->$status_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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -391,7 +391,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sticky comes after Publish, or if not listed, after All.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -646,7 +646,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_status = ! empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( post_type_supports( $post_type, 'comments' ) && ! in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( post_type_supports( $post_type, 'comments' ) && ! in_array( $post_status, array( 'pending', 'draft', 'future' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></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">@@ -1384,7 +1384,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 ( is_post_type_viewable( $post_type_object ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $can_edit_post ) {
</span><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"> $actions['view'] = sprintf(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpscreenphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-screen.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-screen.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-screen.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1157,7 +1157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $columns as $column => $title ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Can't hide these for they are special.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $column, $special ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column, $special, 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,7 +1174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id = "$column-hide";
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label>';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden ), true, false ) . ' />';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<input class="hide-column-tog" name="' . $id . '" type="checkbox" id="' . $id . '" value="' . $column . '"' . checked( ! in_array( $column, $hidden, true ), true, false ) . ' />';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "$title</label>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1310,7 +1310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $view_mode_post_types = apply_filters( 'view_mode_post_types', $view_mode_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">- if ( ! in_array( $this->post_type, $view_mode_post_types ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $this->post_type, $view_mode_post_types, 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-terms-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tax = get_taxonomy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // @todo Still needed? Maybe just the show_ui part.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $post_type ) || ! in_array( $post_type, get_post_types( array( 'show_ui' => true ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'post';
</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="trunksrcwpadminincludesclasswpthemeinstalllisttablephp"></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-theme-install-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-theme-install-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -82,7 +82,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $nonmenu_tabs = apply_filters( 'install_themes_nonmenu_tabs', $nonmenu_tabs );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If a non-valid menu tab has been selected, And it's not a non-menu action.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $tab ) || ( ! isset( $tabs[ $tab ] ) && ! in_array( $tab, (array) $nonmenu_tabs, true ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tab = key( $tabs );
</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="trunksrcwpadminincludesclasswpthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-themes-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> public function search_theme( $theme ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Search the features.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->features as $word ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $word, $theme->get( 'Tags' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $word, $theme->get( 'Tags' ), true ) ) {
</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">@@ -309,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Match all phrases.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->search_terms as $word ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $word, $theme->get( 'Tags' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $word, $theme->get( 'Tags' ), 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">
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-upgrader.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $protected_directories = array_merge( $protected_directories, $wp_theme_directories );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $destination, $protected_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $destination, $protected_directories, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $remote_destination = trailingslashit( $remote_destination ) . trailingslashit( basename( $source ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $destination = trailingslashit( $destination ) . trailingslashit( basename( $source ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></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-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $classes .= ' num'; // Special case for that 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 ( in_array( $column_name, $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column_name, $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes .= ' hidden';
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/dashboard.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'normal';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $widget_id, $side_widgets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $widget_id, $side_widgets, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = 'side';
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/file.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1215,7 +1215,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 we can process signatures.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! function_exists( 'sodium_crypto_sign_verify_detached' ) || ! in_array( 'sha384', array_map( 'strtolower', hash_algos() ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! function_exists( 'sodium_crypto_sign_verify_detached' ) || ! in_array( 'sha384', array_map( 'strtolower', hash_algos() ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'signature_verification_unsupported',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_folder = dirname( $dir );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $needed_dirs[] = $parent_folder;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_folder = dirname( $parent_folder );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1666,7 +1666,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"> $parent_folder = dirname( $dir );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( ! empty( $parent_folder ) && untrailingslashit( $to ) != $parent_folder && ! in_array( $parent_folder, $needed_dirs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $needed_dirs[] = $parent_folder;
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_folder = dirname( $parent_folder );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/media.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> if ( isset( $_GET['tab'] ) && 'type_url' === $_GET['tab'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = '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 ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_GET['type'] ) && in_array( $_GET['type'], array( 'video', 'audio', 'file' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = $_GET['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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/meta-boxes.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <div id="publishing-action">
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ) ) || 0 == $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $post->post_status, array( 'publish', 'future', 'private' ), true ) || 0 == $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $can_publish ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post->post_date_gmt ) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</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"> $post_format = '0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Add in the current one if it isn't there yet, in case the current theme doesn't support it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_format && ! in_array( $post_format, $post_formats[0], true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_formats[0][] = $post_format;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -847,7 +847,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p id="no-comments">' . __( 'No comments yet.' ) . '</p>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = get_hidden_meta_boxes( get_current_screen() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'commentsdiv', $hidden ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'commentsdiv', $hidden, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</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"> $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 ) ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1196,7 +1196,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'geographical' == $class && strpos( $link_rel, 'co-resident' ) === false && strpos( $link_rel, 'neighbor' ) === false ) {
</span><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 ) ) {
</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">@@ -1535,7 +1535,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $stati[] = '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 ( in_array( get_post_status( $post ), $stati ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( get_post_status( $post ), $stati, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the post type support comments, or the post has comments,
</span><span class="cx" style="display: block; padding: 0 10px"> // allow the Comments meta box.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/misc.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( T_STRING == $tokens[ $t ][0] && ( '(' == $tokens[ $t + 1 ] || '(' == $tokens[ $t + 2 ] ) ) {
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ) ) ) || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( isset( $tokens[ $t - 2 ][1] ) && in_array( $tokens[ $t - 2 ][1], array( 'function', 'class' ), true ) )
+ || ( isset( $tokens[ $t - 2 ][0] ) && T_OBJECT_OPERATOR == $tokens[ $t - 1 ][0] )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ignore_functions[] = $tokens[ $t ][1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Add this to our stack of unique references.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -623,7 +625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $functions as $function ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $function, $ignore_functions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $function, $ignore_functions, 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"> $out[] = $function;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -656,9 +658,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $map_option = $option;
</span><span class="cx" style="display: block; padding: 0 10px"> $type = str_replace( 'edit_', '', $map_option );
</span><span class="cx" style="display: block; padding: 0 10px"> $type = str_replace( '_per_page', '', $type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $type, get_taxonomies() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $type, get_taxonomies(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $map_option = 'edit_tags_per_page';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $type, get_post_types() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $type, get_post_types(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $map_option = 'edit_per_page';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $option = str_replace( '-', '_', $option );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/ms.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -886,7 +886,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 ( in_array( $delete_user->user_login, $site_admins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $delete_user->user_login, $site_admins, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: User login. */
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,8 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $type = isset( $request['type'] ) ? $request['type'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $object_type = isset( $request['object_type'] ) ? $request['object_type'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $query = isset( $request['q'] ) ? $request['q'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response_format = isset( $request['response-format'] ) && in_array( $request['response-format'], array( 'json', 'markup' ) ) ? $request['response-format'] : 'json';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response_format = isset( $request['response-format'] ) ? $request['response-format'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $response_format || ! in_array( $response_format, array( 'json', 'markup' ), true ) ) {
+ $response_format = 'json';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'markup' == $response_format ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +188,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $wp_meta_boxes['nav-menus'] ) as $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_keys( $wp_meta_boxes['nav-menus'][ $context ] ) as $priority ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_meta_boxes['nav-menus'][ $context ][ $priority ] as $box ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $box['id'], $initial_meta_boxes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $box['id'], $initial_meta_boxes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $box['id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_meta_boxes[] = $box['id'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -336,10 +340,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_name = $box['args']->name;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type_object( $post_type_name );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_name = $post_type_name . '-tab';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Paginate browsing for large numbers of post objects.
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 50;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pagenum = isset( $_REQUEST[ $post_type_name . '-tab' ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pagenum = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -447,10 +452,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'base' => add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_type_name . '-tab' => 'all',
- 'paged' => '%#%',
- 'item-type' => 'post_type',
- 'item-object' => $post_type_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_name => 'all',
+ 'paged' => '%#%',
+ 'item-type' => 'post_type',
+ 'item-object' => $post_type_name,
</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"> 'format' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -473,8 +478,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $walker = new Walker_Nav_Menu_Checklist( $db_fields );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_tab = 'most-recent';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST[ $post_type_name . '-tab' ] ) && in_array( $_REQUEST[ $post_type_name . '-tab' ], array( 'all', 'search' ) ) ) {
- $current_tab = $_REQUEST[ $post_type_name . '-tab' ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'search' ), true ) ) {
+ $current_tab = $_REQUEST[ $tab_name ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST[ 'quick-search-posttype-' . $post_type_name ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,9 +500,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $view_all_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $search_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menu_selected_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $most_recent_url = esc_url( add_query_arg( $post_type_name . '-tab', 'most-recent', remove_query_arg( $removed_args ) ) );
- $view_all_url = esc_url( add_query_arg( $post_type_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
- $search_url = esc_url( add_query_arg( $post_type_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_recent_url = esc_url( add_query_arg( $tab_name, 'most-recent', remove_query_arg( $removed_args ) ) );
+ $view_all_url = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
+ $search_url = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="posttype-<?php echo $post_type_name; ?>" class="posttypediv">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -652,8 +658,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="button-controls wp-clearfix" data-items-type="posttype-<?php echo esc_attr( $post_type_name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="list-controls hide-if-no-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $post_type_name . '-tab' ); ?>" class="select-all" />
- <label for="<?php echo esc_attr( $post_type_name . '-tab' ); ?>"><?php _e( 'Select All' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-to-menu">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -688,10 +694,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_name = $box['args']->name;
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = get_taxonomy( $taxonomy_name );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_name = $taxonomy_name . '-tab';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Paginate browsing for large numbers of objects.
</span><span class="cx" style="display: block; padding: 0 10px"> $per_page = 50;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pagenum = isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pagenum = isset( $_REQUEST[ $tab_name ] ) && isset( $_REQUEST['paged'] ) ? absint( $_REQUEST['paged'] ) : 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $offset = 0 < $pagenum ? $per_page * ( $pagenum - 1 ) : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -732,10 +739,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'base' => add_query_arg(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $taxonomy_name . '-tab' => 'all',
- 'paged' => '%#%',
- 'item-type' => 'taxonomy',
- 'item-object' => $taxonomy_name,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab_name => 'all',
+ 'paged' => '%#%',
+ 'item-type' => 'taxonomy',
+ 'item-object' => $taxonomy_name,
</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"> 'format' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -758,8 +765,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $walker = new Walker_Nav_Menu_Checklist( $db_fields );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $current_tab = 'most-used';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $_REQUEST[ $taxonomy_name . '-tab' ] ) && in_array( $_REQUEST[ $taxonomy_name . '-tab' ], array( 'all', 'most-used', 'search' ) ) ) {
- $current_tab = $_REQUEST[ $taxonomy_name . '-tab' ];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $_REQUEST[ $tab_name ] ) && in_array( $_REQUEST[ $tab_name ], array( 'all', 'most-used', 'search' ), true ) ) {
+ $current_tab = $_REQUEST[ $tab_name ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_REQUEST[ 'quick-search-taxonomy-' . $taxonomy_name ] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -779,9 +787,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $view_all_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $search_url = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menu_selected_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $most_used_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'most-used', remove_query_arg( $removed_args ) ) );
- $view_all_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'all', remove_query_arg( $removed_args ) ) );
- $search_url = esc_url( add_query_arg( $taxonomy_name . '-tab', 'search', remove_query_arg( $removed_args ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $most_used_url = esc_url( add_query_arg( $tab_name, 'most-used', remove_query_arg( $removed_args ) ) );
+ $view_all_url = esc_url( add_query_arg( $tab_name, 'all', remove_query_arg( $removed_args ) ) );
+ $search_url = esc_url( add_query_arg( $tab_name, 'search', remove_query_arg( $removed_args ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="taxonomy-<?php echo $taxonomy_name; ?>" class="taxonomydiv">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -882,8 +890,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="button-controls wp-clearfix" data-items-type="taxonomy-<?php echo esc_attr( $taxonomy_name ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="list-controls hide-if-no-js">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $taxonomy_name . '-tab' ); ?>" class="select-all" />
- <label for="<?php echo esc_attr( $taxonomy_name . '-tab' ); ?>"><?php _e( 'Select All' ); ?></label>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input type="checkbox"<?php wp_nav_menu_disabled_check( $nav_menu_selected_id ); ?> id="<?php echo esc_attr( $tab_name ); ?>" class="select-all" />
+ <label for="<?php echo esc_attr( $tab_name ); ?>"><?php _e( 'Select All' ); ?></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> </span>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="add-to-menu">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,7 +928,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // And item type either isn't set.
</span><span class="cx" style="display: block; padding: 0 10px"> ! isset( $_item_object_data['menu-item-type'] ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> // Or URL is the default.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ) ) ||
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ in_array( $_item_object_data['menu-item-url'], array( 'https://', 'http://', '' ), true ) ||
</ins><span class="cx" style="display: block; padding: 0 10px"> // Or it's not a custom menu item (but not the custom home page).
</span><span class="cx" style="display: block; padding: 0 10px"> ! ( 'custom' == $_item_object_data['menu-item-type'] && ! isset( $_item_object_data['menu-item-db-id'] ) ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> // Or it *is* a custom menu item that already exists.
</span></span></pre></div>
<a id="trunksrcwpadminincludesnetworkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/network.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/network.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/network.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $hostname = get_clean_basedomain();
</span><span class="cx" style="display: block; padding: 0 10px"> $has_ports = strstr( $hostname, ':' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( false !== $has_ports && ! in_array( $has_ports, array( ':80', ':443' ), true ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div class="error"><p><strong>' . __( 'Error:' ) . '</strong> ' . __( 'You cannot install a network of sites with your server address.' ) . '</p></div>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<p>' . sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Port number. */
</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"> $error_codes = $errors->get_error_codes();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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['sitename'] ) && ! in_array( 'empty_sitename', $error_codes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['sitename'] ) && ! in_array( 'empty_sitename', $error_codes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_name = $_POST['sitename'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Default network title. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_name = sprintf( __( '%s Sites' ), get_option( 'blogname' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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['email'] ) && ! in_array( 'invalid_email', $error_codes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $_POST['email'] ) && ! in_array( 'invalid_email', $error_codes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_email = $_POST['email'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_email = get_option( 'admin_email' );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/plugin.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -523,7 +523,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True, if in the active plugins list. False, not in the list.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_plugin_active( $plugin ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) || is_plugin_active_for_network( $plugin );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $plugin, (array) get_option( 'active_plugins', array() ), true ) || is_plugin_active_for_network( $plugin );
</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">@@ -644,7 +644,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $requirements;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( $network_wide && ! isset( $current[ $plugin ] ) ) || ( ! $network_wide && ! in_array( $plugin, $current, true ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $redirect ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We'll override this later if the plugin can be included without fatal error.
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,7 +783,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 ( true !== $network_wide ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = array_search( $plugin, $current );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_search( $plugin, $current, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $do_blog = true;
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $current[ $key ] );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/post.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,8 +134,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Posts 'submitted for approval' are submitted to $_POST the same as if they were being published.
</span><span class="cx" style="display: block; padding: 0 10px"> // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post_data['post_status'] ) && ( in_array( $post_data['post_status'], $published_statuses ) && ! current_user_can( $ptype->cap->publish_posts ) ) ) {
- if ( ! in_array( $previous_status, $published_statuses ) || ! current_user_can( 'edit_post', $post_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $post_data['post_status'] )
+ && ( in_array( $post_data['post_status'], $published_statuses, true )
+ && ! current_user_can( $ptype->cap->publish_posts ) )
+ ) {
+ if ( ! in_array( $previous_status, $published_statuses, true ) || ! current_user_can( 'edit_post', $post_id ) ) {
</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">@@ -564,7 +567,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( get_post_type( $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 ( ! isset( $post_type_object ) || ( isset( $children ) && in_array( $post_ID, $children ) ) || ! current_user_can( 'edit_post', $post_ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $post_type_object )
+ || ( isset( $children ) && in_array( $post_ID, $children ) )
+ || ! current_user_can( 'edit_post', $post_ID )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $skipped[] = $post_ID;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +599,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['tax_input'][ $tax_name ] = array_merge( $current_terms, $new_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 ( isset( $new_cats ) && in_array( 'category', $tax_names ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $new_cats ) && in_array( 'category', $tax_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cats = (array) wp_get_post_categories( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_data['post_category'] = array_unique( array_merge( $cats, $new_cats ) );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $post_data['tax_input']['category'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,7 +1043,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = $post['post_content'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
</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( 'publish', 'future', 'private' ) ) ) {
</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( 'publish', 'future', 'private' ), 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1110,7 +1116,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $post_stati = get_post_stati();
</span><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_type'] ) && in_array( $q['post_type'], get_post_types() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['post_type'] ) && in_array( $q['post_type'], get_post_types(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = $q['post_type'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'post';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1120,7 +1126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $perm = '';
</span><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_status'] ) && in_array( $q['post_status'], $post_stati ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $q['post_status'] ) && in_array( $q['post_status'], $post_stati, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status = $q['post_status'];
</span><span class="cx" style="display: block; padding: 0 10px"> $perm = 'readable';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1129,7 +1135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $q['orderby'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = $q['orderby'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $q['post_status'] ) && in_array( $q['post_status'], array( 'pending', 'draft' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderby = 'modified';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1294,7 +1300,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $closed ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes = in_array( $box_id, $closed ) ? array( 'closed' ) : array( '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes = in_array( $box_id, $closed, true ) ? array( 'closed' ) : array( '' );
</ins><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"> $classes = array( '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1342,7 +1348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original_name = $post->post_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post->post_status = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_name = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/schema.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $offset_or_tz = _x( '0', 'default GMT offset or timezone string' ); // phpcs:ignore WordPress.WP.I18n.NoEmptyStrings
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $offset_or_tz ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $gmt_offset = $offset_or_tz;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $offset_or_tz && in_array( $offset_or_tz, timezone_identifiers_list(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $timezone_string = $offset_or_tz;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -563,11 +563,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); // phpcs:ignore WordPress.DB.PreparedSQL.NotPrepared
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $insert = '';
</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 ( $options as $option => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $option, $existing_options ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $option, $existing_options, true ) ) {
</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 ( in_array( $option, $fat_options ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( $option, $fat_options, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $autoload = 'no';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $autoload = 'yes';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -576,9 +578,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = serialize( $value );
</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( $insert ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $insert .= ', ';
</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"> $insert .= $wpdb->prepare( '(%s, %s, %s)', $option, $value, $autoload );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/screen.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<label for="%1$s-hide"><input class="hide-postbox-tog" name="%1$s-hide" type="checkbox" id="%1$s-hide" value="%1$s" %2$s />%3$s</label>',
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $box['id'] ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- checked( in_array( $box['id'], $hidden ), false, false ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ checked( in_array( $box['id'], $hidden, true ), false, false ),
</ins><span class="cx" style="display: block; padding: 0 10px"> $widget_title
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -783,7 +783,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $for_post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $edit = ! ( in_array( $post->post_status, array( 'draft', 'pending' ) ) && ( ! $post->post_date_gmt || '0000-00-00 00:00:00' == $post->post_date_gmt ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $edit = ! ( in_array( $post->post_status, array( 'draft', 'pending' ), true ) && ( ! $post->post_date_gmt || '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">
</span><span class="cx" style="display: block; padding: 0 10px"> $tab_index_attribute = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1297,7 +1297,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $i++;
</span><span class="cx" style="display: block; padding: 0 10px"> // get_hidden_meta_boxes() doesn't apply in the block editor.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hidden_class = ( ! $screen->is_block_editor() && in_array( $box['id'], $hidden ) ) ? ' hide-if-js' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hidden_class = ( ! $screen->is_block_editor() && in_array( $box['id'], $hidden, true ) ) ? ' hide-if-js' : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<div id="' . $box['id'] . '" class="postbox ' . postbox_classes( $box['id'], $page ) . $hidden_class . '" ' . '>' . "\n";
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'dashboard_browser_nag' != $box['id'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_title = $box['title'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1453,7 +1453,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"> $i++;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hidden_class = in_array( $box['id'], $hidden ) ? 'hide-if-js' : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hidden_class = in_array( $box['id'], $hidden, true ) ? 'hide-if-js' : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $open_class = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $first_open && empty( $hidden_class ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1838,7 +1838,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $details['type'] = 'success';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $details['type'], array( 'error', 'success', 'warning', 'info' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $details['type'], array( 'error', 'success', 'warning', 'info' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $details['type'] = 'notice-' . $details['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">@@ -2373,7 +2373,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'secondary' === $t || 'button-secondary' === $t ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $classes[] = in_array( $t, $button_shorthand ) ? 'button-' . $t : $t;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $classes[] = in_array( $t, $button_shorthand, true ) ? 'button-' . $t : $t;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove empty items, remove duplicate items, and finally build a string.
</span><span class="cx" style="display: block; padding: 0 10px"> $class = implode( ' ', array_unique( array_filter( $classes ) ) );
</span></span></pre></div>
<a id="trunksrcwpadminincludestranslationinstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/translation-install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/translation-install.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/translation-install.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> // Include an unmodified $wp_version.
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/version.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $type, array( 'plugins', 'themes', 'core' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_type', __( 'Invalid translation 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">@@ -176,7 +176,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $language['language'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( current( $language['iso'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $language['strings']['continue'] ?: 'Continue' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $language['native_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">@@ -190,7 +190,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $language['language'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( current( $language['iso'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> esc_attr( $language['strings']['continue'] ?: 'Continue' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- in_array( $language['language'], $installed_languages ) ? ' data-installed="1"' : '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ in_array( $language['language'], $installed_languages, true ) ? ' data-installed="1"' : '',
</ins><span class="cx" style="display: block; padding: 0 10px"> esc_html( $language['native_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">@@ -211,7 +211,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_download_language_pack( $download ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the translation is already installed.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $download, get_available_languages() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $download, get_available_languages(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $download;
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/update-core.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1045,7 +1045,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $working_dir_local . $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ), 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 ( md5_file( ABSPATH . $file ) === $checksum ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1115,7 +1115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $working_dir_local . $file ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' === dirname( $file ) && in_array( pathinfo( $file, PATHINFO_EXTENSION ), array( 'html', 'txt' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $skip[] = $file;
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1913,7 +1913,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_current_db_version;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 29630 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() && false === get_option( 'WPLANG' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && in_array( WPLANG, get_available_languages(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> update_option( 'WPLANG', WPLANG );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'WPLANG', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2635,7 +2635,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $global_tables = $wpdb->tables( 'global' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cqueries as $table => $qry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $table, $global_tables ) && ! wp_should_upgrade_global_tables() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $table, $global_tables, true ) && ! wp_should_upgrade_global_tables() ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $cqueries[ $table ], $for_update[ $table ] );
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2799,14 +2799,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Is actual field type different from the field type in query?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tablefield->Type != $fieldtype ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $do_change = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $fieldtype_lowercased, $text_fields ) && in_array( $tablefield_type_lowercased, $text_fields ) ) {
- if ( array_search( $fieldtype_lowercased, $text_fields ) < array_search( $tablefield_type_lowercased, $text_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $fieldtype_lowercased, $text_fields, true ) && in_array( $tablefield_type_lowercased, $text_fields, true ) ) {
+ if ( array_search( $fieldtype_lowercased, $text_fields, true ) < array_search( $tablefield_type_lowercased, $text_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $do_change = 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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $fieldtype_lowercased, $blob_fields ) && in_array( $tablefield_type_lowercased, $blob_fields ) ) {
- if ( array_search( $fieldtype_lowercased, $blob_fields ) < array_search( $tablefield_type_lowercased, $blob_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $fieldtype_lowercased, $blob_fields, true ) && in_array( $tablefield_type_lowercased, $blob_fields, true ) ) {
+ if ( array_search( $fieldtype_lowercased, $blob_fields, true ) < array_search( $tablefield_type_lowercased, $blob_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $do_change = 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">@@ -2901,7 +2901,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $index_string .= " ($index_columns)";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if the index definition exists, ignoring subparts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $aindex = array_search( $index_string, $indices_without_subparts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $aindex = array_search( $index_string, $indices_without_subparts, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $aindex ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the index already exists (even with different subparts), we don't need to create it.
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $indices_without_subparts[ $aindex ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3245,7 +3245,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> if ( basename( $plugin ) == 'widgets.php' ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array_splice( $plugins, array_search( $plugin, $plugins ), 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array_splice( $plugins, array_search( $plugin, $plugins, true ), 1 );
</ins><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 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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/includes/widgets.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $widget_id = $sidebar_args['widget_id'];
</span><span class="cx" style="display: block; padding: 0 10px"> $sidebar_id = isset( $sidebar_args['id'] ) ? $sidebar_args['id'] : false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ] ) : '-1'; // Position of widget in sidebar.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = $sidebar_id ? array_search( $widget_id, $sidebars_widgets[ $sidebar_id ], true ) : '-1'; // Position of widget in sidebar.
</ins><span class="cx" style="display: block; padding: 0 10px"> $control = isset( $wp_registered_widget_controls[ $widget_id ] ) ? $wp_registered_widget_controls[ $widget_id ] : array();
</span><span class="cx" style="display: block; padding: 0 10px"> $widget = $wp_registered_widgets[ $widget_id ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminloadscriptsphp"></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/load-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-scripts.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/load-scripts.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'WPINC', 'wp-includes' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = $_SERVER['SERVER_PROTOCOL'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $protocol = 'HTTP/1.0';
</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="trunksrcwpadminloadstylesphp"></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/load-styles.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/load-styles.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/load-styles.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> require ABSPATH . WPINC . '/version.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = $_SERVER['SERVER_PROTOCOL'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $protocol = 'HTTP/1.0';
</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="trunksrcwpadminmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/menu.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +135,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_icon = esc_url( $ptype_obj->menu_icon );
</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 ( in_array( $ptype, $builtin ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $ptype, $builtin, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_icon = 'dashicons-admin-' . $ptype;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $edit_tags_file = "edit-tags.php?taxonomy=%s&post_type=$ptype";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $ptype, $builtin ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $ptype, $builtin, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptype_menu_id = 'menu-' . $ptype_for_id . 's';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $ptype_menu_id = 'menu-posts-' . $ptype_for_id;
</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"> * by a hard-coded value below, increment the position.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $core_menu_positions = array( 59, 60, 65, 70, 75, 80, 85, 99 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( isset( $menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( isset( $menu[ $ptype_menu_position ] ) || in_array( $ptype_menu_position, $core_menu_positions, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $ptype_menu_position++;
</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="trunksrcwpadminmysitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/my-sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/my-sites.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/my-sites.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </h1>
</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 ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( in_array( get_site_option( 'registration' ), array( 'all', 'blog' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-login.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $sign_up_url = apply_filters( 'wp_signup_location', network_site_url( 'wp-signup.php' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> printf( ' <a href="%s" class="page-title-action">%s</a>', esc_url( $sign_up_url ), esc_html_x( 'Add New', 'site' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/settings.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/network/settings.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,7 +416,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $lang = get_site_option( 'WPLANG' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $lang, $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $lang, $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lang = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitenewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-new.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/network/site-new.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $subdirectory_reserved_names = get_subdirectory_reserved_names();
</span><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_array( $domain, $subdirectory_reserved_names ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $domain, $subdirectory_reserved_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Reserved names list. */
</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"> if ( isset( $_POST['WPLANG'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $_POST['WPLANG'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta['WPLANG'] = ''; // en_US
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $_POST['WPLANG'], get_available_languages() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $_POST['WPLANG'], get_available_languages(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta['WPLANG'] = $_POST['WPLANG'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( current_user_can( 'install_languages' ) && wp_can_install_language_pack() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $language = wp_download_language_pack( wp_unslash( $_POST['WPLANG'] ) );
</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"> $lang = get_site_option( 'WPLANG' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Use English if the default isn't available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $lang, $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $lang, $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lang = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/network/site-settings.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $_POST['option'] as $key => $val ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $key = wp_unslash( $key );
</span><span class="cx" style="display: block; padding: 0 10px"> $val = wp_unslash( $val );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 === $key || is_array( $val ) || in_array( $key, $skip_options ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 === $key || is_array( $val ) || in_array( $key, $skip_options, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue; // Avoids "0 is a protected WP option and may not be modified" error when edit blog options.
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( $key, $val );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr class="form-field">
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="<?php echo esc_attr( $option->option_name ); ?>"><?php echo esc_html( ucwords( str_replace( '_', ' ', $option->option_name ) ) ); ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ) ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $is_main_site && in_array( $option->option_name, array( 'siteurl', 'home' ), true ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <td><code><?php echo esc_html( $option->option_value ); ?></code></td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php } else { ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input class="<?php echo $class; ?>" name="option[<?php echo esc_attr( $option->option_name ); ?>]" type="text" id="<?php echo esc_attr( $option->option_name ); ?>" value="<?php echo esc_attr( $option->option_value ); ?>" size="40" <?php disabled( $disabled ); ?> /></td>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/update.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/network/update.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.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( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ), true ) ) {
</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="trunksrcwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/options-general.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -157,7 +157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $languages = get_available_languages();
</span><span class="cx" style="display: block; padding: 0 10px"> $translations = wp_get_available_translations();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $languages[] = WPLANG;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $languages ) || ! empty( $translations ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $locale = get_locale();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $locale, $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $locale, $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $locale = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -276,7 +276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <br />
</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 ( in_array( $tzstring, timezone_identifiers_list() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $tzstring, timezone_identifiers_list(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $transitions = timezone_transitions_get( timezone_open( $tzstring ), time() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 0 index is the state at current time, 1 index is the next transition, if any.
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/options-permalink.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array( $permalink_structure, $structures ) ); ?> />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label><input name="selection" id="custom_selection" type="radio" value="custom" <?php checked( ! in_array( $permalink_structure, $structures, true ) ); ?> />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php _e( 'Custom Structure' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> </th>
</span></span></pre></div>
<a id="trunksrcwpadminoptionsreadingphp"></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-reading.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-reading.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/options-reading.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> settings_fields( 'reading' );
</span><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_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_settings_field( 'blog_charset', __( 'Encoding for pages and feeds' ), 'options_reading_blog_charset', 'reading', 'default', array( 'label_for' => 'blog_charset' ) );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/options.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -152,7 +152,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mail_options = array( 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $whitelist_options['reading'][] = 'blog_charset';
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/plugin-editor.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -112,7 +112,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/\.([^.]+)$/', $real_file, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = strtolower( $matches[1] );
</span><span class="cx" style="display: block; padding: 0 10px"> // If extension is not in the acceptable list, skip it.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $ext, $editable_extensions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $ext, $editable_extensions, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( sprintf( '<p>%s</p>', __( 'Files of this type are not editable.' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -244,7 +244,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_editable_files = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $plugin_files as $plugin_file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( preg_match( '/\.([^.]+)$/', $plugin_file, $matches ) && in_array( $matches[1], $editable_extensions ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( preg_match( '/\.([^.]+)$/', $plugin_file, $matches ) && in_array( $matches[1], $editable_extensions, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_editable_files[] = $plugin_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">@@ -277,7 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( is_writeable( $real_file ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="editor-notices">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ) ) ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( $plugin, (array) get_option( 'active_plugins', array() ), true ) ) { ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-warning inline active-plugin-edit-warning">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( '<strong>Warning:</strong> Making changes to active plugins is not recommended.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/post-new.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> if ( ! isset( $_GET['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = 'post';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-} elseif ( in_array( $_GET['post_type'], get_post_types( array( 'show_ui' => true ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+} elseif ( in_array( $_GET['post_type'], get_post_types( array( 'show_ui' => true ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type = $_GET['post_type'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type.' ) );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/post.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> wp_die( __( 'Invalid 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 ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Sorry, you are not allowed to edit posts in this 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="trunksrcwpadmintermphp"></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/term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/term.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/term.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,9 +35,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy = $tax->name;
</span><span class="cx" style="display: block; padding: 0 10px"> $title = $tax->labels->edit_item;
</span><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_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
- ! current_user_can( 'edit_term', $tag->term_id ) ) {
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ), true )
+ || ! current_user_can( 'edit_term', $tag->term_id )
+) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<h1>' . __( 'You need a higher level of permission.' ) . '</h1>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/theme-editor.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -177,7 +177,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $file_description = get_file_description( $relative_file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$file_show = array_search( $file, array_filter( $allowed_files ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$file_show = array_search( $file, array_filter( $allowed_files ), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $description = esc_html( $file_description );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $file_description != $file_show ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $description .= ' <span>(' . esc_html( $file_show ) . ')</span>';
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/update.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6,7 +6,9 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! defined( 'IFRAME_REQUEST' ) && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! defined( 'IFRAME_REQUEST' )
+ && isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'update-selected', 'activate-plugin', 'update-selected-themes' ), true )
+) {
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/upload.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
</span><span class="cx" style="display: block; padding: 0 10px"> $modes = array( 'grid', 'list' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mode = $_GET['mode'];
</span><span class="cx" style="display: block; padding: 0 10px"> update_user_option( get_current_user_id(), 'media_library_mode', $mode );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $vars = wp_edit_attachments_query_vars( $q );
</span><span class="cx" style="display: block; padding: 0 10px"> $ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $vars as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $value || in_array( $key, $ignore ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $value || in_array( $key, $ignore, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $vars[ $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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-admin/user-edit.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -477,7 +477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $profileuser->display_name, $public_display ) ) { // Only add this if it isn't duplicated elsewhere.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $profileuser->display_name, $public_display, true ) ) { // Only add this if it isn't duplicated elsewhere.
</ins><span class="cx" style="display: block; padding: 0 10px"> $public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyeleven/inc/theme-options.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $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 ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $current_layout, array( 'content-sidebar', 'sidebar-content' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'two-column' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes = array( 'one-column' );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfifteen/inc/template-tags.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -61,7 +61,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 ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( get_post_type(), array( 'post', 'attachment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentasidephp"></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-aside.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-aside.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentaudiophp"></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-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-audio.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-audio.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-featured-post.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </a>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentgalleryphp"></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-gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-gallery.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentimagephp"></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-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-image.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-image.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentlinkphp"></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-link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-link.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-link.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentquotephp"></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-quote.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-quote.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteencontentvideophp"></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-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/content-video.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content-video.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .entry-meta -->
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/content.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php twentyfourteen_post_thumbnail(); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <header class="entry-header">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ) ) && twentyfourteen_categorized_blog() ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( in_array( 'category', get_object_taxonomies( get_post_type() ), true ) && twentyfourteen_categorized_blog() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="cat-links"><?php echo get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfourteen' ) ); ?></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/functions.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -544,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_header_image() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'header-image';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! in_array( $GLOBALS['pagenow'], array( 'wp-activate.php', 'wp-signup.php' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'masthead-fixed';
</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="trunksrcwpcontentthemestwentyfourteeninccustomizerphp"></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/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/customizer.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> * @return string Filtered layout type (grid|slider).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function twentyfourteen_sanitize_layout( $layout ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $layout, array( 'grid', 'slider' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $layout, array( 'grid', 'slider' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $layout = 'grid';
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/featured-content.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We only want to hide the featured tag.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'post_tag', $taxonomies ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'post_tag', $taxonomies, true ) ) {
</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></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteenincwidgetsphp"></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/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/widgets.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -71,8 +71,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance An array of settings for this widget instance.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function widget( $args, $instance ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $format = isset( $instance['format'] ) ? $instance['format'] : '';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $format || ! in_array( $format, $this->formats, true ) ) {
+ $format = 'aside';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( $format ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'image':
</span><span class="cx" style="display: block; padding: 0 10px"> $format_string = __( 'Images', 'twentyfourteen' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,8 +109,9 @@
</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">- $number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
- $title = apply_filters( 'widget_title', empty( $instance['title'] ) ? $format_string : $instance['title'], $instance, $this->id_base );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : 2;
+ $title = ! empty( $instance['title'] ) ? $instance['title'] : $format_string;
+ $title = apply_filters( 'widget_title', $title, $instance, $this->id_base );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ephemera = new WP_Query(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -265,7 +270,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function update( $new_instance, $instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['title'] = strip_tags( $new_instance['title'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['number'] = empty( $new_instance['number'] ) ? 2 : absint( $new_instance['number'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $new_instance['format'], $this->formats ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( $new_instance['format'], $this->formats, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['format'] = $new_instance['format'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -280,9 +286,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $instance
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function form( $instance ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = empty( $instance['title'] ) ? '' : esc_attr( $instance['title'] );
- $number = empty( $instance['number'] ) ? 2 : absint( $instance['number'] );
- $format = isset( $instance['format'] ) && in_array( $instance['format'], $this->formats ) ? $instance['format'] : 'aside';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = ! empty( $instance['title'] ) ? esc_attr( $instance['title'] ) : '';
+ $number = ! empty( $instance['number'] ) ? absint( $instance['number'] ) : 2;
+ $format = isset( $instance['format'] ) ? $instance['format'] : '';
+
+ if ( ! $format || ! in_array( $format, $this->formats, true ) ) {
+ $format = 'aside';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><label for="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>"><?php _e( 'Title:', 'twentyfourteen' ); ?></label>
</span><span class="cx" style="display: block; padding: 0 10px"> <input id="<?php echo esc_attr( $this->get_field_id( 'title' ) ); ?>" class="widefat" name="<?php echo esc_attr( $this->get_field_name( 'title' ) ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>"></p>
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteeninctemplatefunctionsphp"></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/inc/template-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentynineteen/inc/template-functions.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> function twentynineteen_nav_menu_link_attributes( $atts, $item, $args, $depth ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add [aria-haspopup] and [aria-expanded] to menu items that have children.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $item_has_children = in_array( 'menu-item-has-children', $item->classes );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $item_has_children = in_array( 'menu-item-has-children', $item->classes, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $item_has_children ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['aria-haspopup'] = 'true';
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['aria-expanded'] = 'false';
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentysixteeninctemplatetagsphp"></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/twentysixteen/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/twentysixteen/inc/template-tags.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentysixteen/inc/template-tags.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( get_post_type(), array( 'post', 'attachment' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> twentysixteen_entry_date();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-content/themes/twentytwelve/functions.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -578,7 +578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $background_image ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $background_color ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'custom-background-empty';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $background_color, array( 'fff', 'ffffff' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $background_color, array( 'fff', 'ffffff' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'custom-background-white';
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/author-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $authordata = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, array( 'login', 'pass', 'nicename', 'email', 'url', 'registered', 'activation_key', 'status' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $field = 'user_' . $field;
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/bookmark.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,9 +279,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( explode( ',', $orderby ) as $ordparam ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $ordparam = trim( $ordparam );
</span><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_array( 'link_' . $ordparam, $keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'link_' . $ordparam, $keys, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderparams[] = 'link_' . $ordparam;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $ordparam, $keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $ordparam, $keys, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $orderparams[] = $ordparam;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $order = strtoupper( $parsed_args['order'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $order && ! in_array( $order, array( 'ASC', 'DESC' ), true ) ) {
</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">@@ -412,7 +412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'link_target': // "enum"
</span><span class="cx" style="display: block; padding: 0 10px"> $targets = array( '_top', '_blank' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $value, $targets ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, $targets, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = '';
</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="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/canonical.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function redirect_canonical( $requested_url = null, $do_redirect = true ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
</span><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( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ), 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 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">
</span><span class="cx" style="display: block; padding: 0 10px"> $addl_path = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_feed() && in_array( get_query_var( 'feed' ), $wp_rewrite->feeds ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_feed() && in_array( get_query_var( 'feed' ), $wp_rewrite->feeds, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $addl_path = ! empty( $addl_path ) ? trailingslashit( $addl_path ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_singular() && get_query_var( 'withcomments' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $addl_path .= 'comments/';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,7 +751,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( 'dashboard', 'relative' ),
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( 'admin', 'relative' ),
</span><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_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $admins, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( admin_url() );
</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">@@ -761,7 +761,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> home_url( 'login', 'relative' ),
</span><span class="cx" style="display: block; padding: 0 10px"> site_url( 'login', 'relative' ),
</span><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_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( untrailingslashit( $_SERVER['REQUEST_URI'] ), $logins, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( wp_login_url() );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/capabilities.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> if ( is_multisite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $super_admins = get_super_admins();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins, true ) ) {
</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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -921,7 +921,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $super_admins = get_site_option( 'site_admins', array( 'admin' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $user && ! in_array( $user->user_login, $super_admins, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $super_admins[] = $user->user_login;
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'site_admins', $super_admins );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,7 +969,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user = get_userdata( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key = array_search( $user->user_login, $super_admins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_search( $user->user_login, $super_admins, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $super_admins[ $key ] );
</span><span class="cx" style="display: block; padding: 0 10px"> update_site_option( 'site_admins', $super_admins );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/category-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -590,7 +590,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For taxonomies that belong only to custom post types, point to a valid archive.
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomy_object = get_taxonomy( $parsed_args['taxonomy'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'post', $taxonomy_object->object_type, true ) && ! in_array( 'page', $taxonomy_object->object_type, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomy_object->object_type as $object_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_object_type = get_post_type_object( $object_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-http.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,7 +532,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop over each transport on each HTTP request looking for one which will serve this request's needs.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $request_order as $transport ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $transport, $transports ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $transport, $transports, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $transport = ucfirst( $transport );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $class = 'WP_Http_' . $transport;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -904,7 +904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $wildcard_regex ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return ! preg_match( $wildcard_regex, $check['host'] );
</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">- return ! in_array( $check['host'], $accessible_hosts ); // Inverse logic, if it's in the array, then don't block it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ! in_array( $check['host'], $accessible_hosts, true ); // Inverse logic, if it's in the array, then don't block it.
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -516,7 +516,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"> // 'any' overrides other statuses.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( 'any', $statuses ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( 'any', $statuses, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $statuses as $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'hold':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,7 +595,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_order = $_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 ( ! $found_orderby_comment_id && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $found_orderby_comment_id && in_array( $_orderby, array( 'comment_ID', 'comment__in' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_orderby_comment_id = 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">@@ -1145,7 +1145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'comment__in' === $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $orderby, $allowed_keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $orderby, $allowed_keys, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $meta_query_clauses[ $orderby ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_clause = $meta_query_clauses[ $orderby ];
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcommentphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-comment.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -343,7 +343,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __isset( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->post_fields ) && 0 !== (int) $this->comment_post_ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->post_fields, true ) && 0 !== (int) $this->comment_post_ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $this->comment_post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> return property_exists( $post, $name );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->post_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->post_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $this->comment_post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> return $post->$name;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5899,11 +5899,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _sanitize_background_setting( $value, $setting ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'background_repeat' === $setting->id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $value, array( 'repeat-x', 'repeat-y', 'repeat', 'no-repeat' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, array( 'repeat-x', 'repeat-y', 'repeat', 'no-repeat' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_value', __( 'Invalid value for background repeat.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'background_attachment' === $setting->id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $value, array( 'fixed', 'scroll' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, array( 'fixed', 'scroll' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_value', __( 'Invalid value for background attachment.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'background_position_x' === $setting->id ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -450,7 +450,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => $wp_registered_sidebars[ $sidebar_id ]['name'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => $wp_registered_sidebars[ $sidebar_id ]['description'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'priority' => array_search( $sidebar_id, array_keys( $wp_registered_sidebars ), true ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'panel' => 'widgets',
</span><span class="cx" style="display: block; padding: 0 10px"> 'sidebar_id' => $sidebar_id,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -577,7 +577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_widget_id = $this->parse_widget_id( $widget_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $width = $wp_registered_widget_controls[ $widget_id ]['width'];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_core = in_array( $parsed_widget_id['id_base'], $this->core_widget_id_bases );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_core = in_array( $parsed_widget_id['id_base'], $this->core_widget_id_bases, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_wide = ( $width > 250 && ! $is_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">@@ -1220,7 +1220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the widget is rendered.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_widget_rendered( $widget_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $widget_id, $this->rendered_widgets );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $widget_id, $this->rendered_widgets, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1232,7 +1232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the sidebar is rendered.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function is_sidebar_rendered( $sidebar_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $sidebar_id, $this->rendered_sidebars );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $sidebar_id, $this->rendered_sidebars, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdatequeryphp"></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-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-date-query.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-date-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -259,7 +259,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The comparison operator.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_compare( $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $query['compare'] ) && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $query['compare'] )
+ && in_array( $query['compare'], array( '=', '!=', '>', '>=', '<', '<=', 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ), true )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return strtoupper( $query['compare'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * 'post_modified_gmt', 'comment_date', 'comment_date_gmt',
</span><span class="cx" style="display: block; padding: 0 10px"> * 'user_registered'
</span><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_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $column, apply_filters( 'date_query_valid_columns', $valid_columns ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $column = 'post_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">@@ -526,7 +528,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's a known column name, add the appropriate table prefix.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $known_columns as $table_name => $table_columns ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $column, $table_columns ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $column, $table_columns, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $column = $table_name . '.' . $column;
</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">@@ -972,7 +974,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"> // Complex combined queries aren't supported for multi-value queries.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $this->build_value( $compare, $hour );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-editor.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $plugins = array_unique( apply_filters( 'tiny_mce_plugins', $plugins, $editor_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">- $key = array_search( 'spellchecker', $plugins );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key = array_search( 'spellchecker', $plugins, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove 'spellchecker' from the internal plugins if added with 'tiny_mce_plugins' filter to prevent errors.
</span><span class="cx" style="display: block; padding: 0 10px"> // It can be added with 'mce_external_plugins'.
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-embed.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -370,6 +370,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_types = get_post_types( array( 'show_ui' => true ) );
</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 array of post types to cache oEmbed results for.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -377,7 +378,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $post_types Array of post type names to cache oEmbed results for. Defaults to post types with `show_ui` set to true.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $post->ID ) || ! in_array( $post->post_type, apply_filters( 'embed_cache_oembed_types', $post_types ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $cache_oembed_types = apply_filters( 'embed_cache_oembed_types', $post_types );
+
+ if ( empty( $post->ID ) || ! in_array( $post->post_type, $cache_oembed_types, 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-http-streams.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> // Exact hostname/IP matches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtolower( $host ), $certificate_hostnames ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtolower( $host ), $certificate_hostnames, true ) ) {
</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">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Wildcard subdomains certs (*.example.com) are valid for a.example.com but not a.b.example.com.
</span><span class="cx" style="display: block; padding: 0 10px"> $wildcard_host = preg_replace( '/^[^.]+\./', '*.', $host );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( strtolower( $wildcard_host ), $certificate_hostnames );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( strtolower( $wildcard_host ), $certificate_hostnames, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-image-editor.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> * @return string|false
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected static function get_extension( $mime_type = null ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $extensions = explode( '|', array_search( $mime_type, wp_get_mime_types() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $extensions = explode( '|', array_search( $mime_type, wp_get_mime_types(), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $extensions[0] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-meta-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -687,7 +687,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists( 'value', $clause ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_value = $clause['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 ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $meta_compare, array( 'IN', 'NOT IN', 'BETWEEN', 'NOT BETWEEN' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $meta_value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_value = preg_split( '/[,\s]+/', $meta_value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> $clause_compare = strtoupper( $clause['compare'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $sibling_compare = strtoupper( $sibling['compare'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $clause_compare, $compatible_compares ) && in_array( $sibling_compare, $compatible_compares ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $clause_compare, $compatible_compares, true ) && in_array( $sibling_compare, $compatible_compares, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alias = $sibling['alias'];
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-network-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -551,7 +551,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'domain_length' === $orderby || 'path_length' === $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $field = substr( $orderby, 0, -7 );
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = "CHAR_LENGTH($wpdb->site.$field)";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $orderby, $allowed_keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $orderby, $allowed_keys, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = "$wpdb->site.$orderby";
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-oembed.php 2020-04-05 03:00:44 UTC (rev 47550)
</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 mixed|bool Return value of the callback, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __call( $name, $arguments ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_methods ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_methods, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name( ...$arguments );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return 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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-post-type.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,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 quirky handling in version 3.0. #14122.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $args['capabilities'] ) && null === $args['map_meta_cap'] && in_array( $args['capability_type'], array( 'post', 'page' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $args['capabilities'] )
+ && null === $args['map_meta_cap'] && in_array( $args['capability_type'], array( 'post', 'page' ), true )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['map_meta_cap'] = 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2156,7 +2156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status_join = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( 'attachment', (array) $post_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( 'attachment', (array) $post_type, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status_join = 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">@@ -2177,7 +2177,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 ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['taxonomy'] = $queried_taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'slug' === $queried_items['field'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2463,15 +2463,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r_status = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $p_status = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $e_status = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'any', $q_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'any', $q_status, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $status, $q_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status, $q_status, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $e_status[] = "{$wpdb->posts}.post_status <> '$status'";
</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"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( get_post_stati() as $status ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $status, $q_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $status, $q_status, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'private' == $status ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -3083,7 +3083,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the post_status was specifically requested, let it pass through.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $status, $q_status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $status, $q_status, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status_obj = get_post_status_object( $status );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_status_obj && ! $post_status_obj->public ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3564,7 +3564,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$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">@@ -3578,7 +3578,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->$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">@@ -3593,7 +3593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed|false Return value of the callback, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __call( $name, $arguments ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_methods ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_methods, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name( ...$arguments );
</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">@@ -3632,7 +3632,7 @@
</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">- return in_array( $post_type_object->name, (array) $post_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $post_type_object->name, (array) $post_types, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3657,11 +3657,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_obj = $this->get_queried_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">- if ( in_array( (string) $post_obj->ID, $attachment ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $post_obj->ID, $attachment, true ) ) {
</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 ( in_array( $post_obj->post_title, $attachment ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post_obj->post_title, $attachment, true ) ) {
</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 ( in_array( $post_obj->post_name, $attachment ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post_obj->post_name, $attachment, true ) ) {
</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"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3692,11 +3692,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $author = array_map( 'strval', (array) $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">- if ( in_array( (string) $author_obj->ID, $author ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $author_obj->ID, $author, true ) ) {
</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 ( in_array( $author_obj->nickname, $author ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $author_obj->nickname, $author, true ) ) {
</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 ( in_array( $author_obj->user_nicename, $author ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $author_obj->user_nicename, $author, true ) ) {
</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">@@ -3728,11 +3728,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = array_map( 'strval', (array) $category );
</span><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_array( (string) $cat_obj->term_id, $category ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $cat_obj->term_id, $category, true ) ) {
</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 ( in_array( $cat_obj->name, $category ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $cat_obj->name, $category, true ) ) {
</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 ( in_array( $cat_obj->slug, $category ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $cat_obj->slug, $category, true ) ) {
</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">@@ -3764,11 +3764,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = array_map( 'strval', (array) $tag );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( (string) $tag_obj->term_id, $tag ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $tag_obj->term_id, $tag, true ) ) {
</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 ( in_array( $tag_obj->name, $tag ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $tag_obj->name, $tag, true ) ) {
</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 ( in_array( $tag_obj->slug, $tag ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $tag_obj->slug, $tag, true ) ) {
</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">@@ -3812,7 +3812,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_array = (array) $term;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check that the taxonomy matches.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array, true ) ) ) {
</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">@@ -3883,7 +3883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'feed' == $qv ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $qv = get_default_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">- return in_array( $qv, (array) $feeds );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $qv, (array) $feeds, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4004,11 +4004,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = array_map( 'strval', (array) $page );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( (string) $page_obj->ID, $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $page_obj->ID, $page, true ) ) {
</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 ( in_array( $page_obj->post_title, $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $page_obj->post_title, $page, true ) ) {
</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 ( in_array( $page_obj->post_name, $page ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $page_obj->post_name, $page, true ) ) {
</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"> foreach ( $page as $pagepath ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4111,11 +4111,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = array_map( 'strval', (array) $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 ( in_array( (string) $post_obj->ID, $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (string) $post_obj->ID, $post, true ) ) {
</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 ( in_array( $post_obj->post_title, $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post_obj->post_title, $post, true ) ) {
</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 ( in_array( $post_obj->post_name, $post ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post_obj->post_name, $post, true ) ) {
</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"> foreach ( $post as $postpath ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4156,7 +4156,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_obj = $this->get_queried_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">- return in_array( $post_obj->post_type, (array) $post_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $post_obj->post_type, (array) $post_types, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -797,7 +797,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $query String to append to the rewritten query. Must end in '='.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_rewrite_tag( $tag, $regex, $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $position = array_search( $tag, $this->rewritecode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $position = array_search( $tag, $this->rewritecode, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $position && null !== $position ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->rewritereplace[ $position ] = $regex;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->queryreplace[ $position ] = $query;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -821,7 +821,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag Name of the rewrite tag to remove.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_rewrite_tag( $tag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $position = array_search( $tag, $this->rewritecode );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $position = array_search( $tag, $this->rewritecode, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $position && null !== $position ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->rewritecode[ $position ] );
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $this->rewritereplace[ $position ] );
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-tax-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The sibling must both have compatible operator to share its alias.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $alias = $sibling['alias'];
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptextdiffrenderertablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-text-diff-renderer-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-text-diff-renderer-table.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -502,7 +502,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$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">@@ -517,7 +517,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Newly-set property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __set( $name, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name = $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">@@ -531,7 +531,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->$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">@@ -544,7 +544,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->$name );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-theme.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -206,7 +206,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->stylesheet = $theme_dir;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Correct a situation where the theme is 'some-directory/some-theme' but 'some-directory' was passed in as part of the theme root instead.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $theme_root, (array) $wp_theme_directories ) && in_array( dirname( $theme_root ), (array) $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $theme_root, (array) $wp_theme_directories, true )
+ && in_array( dirname( $theme_root ), (array) $wp_theme_directories, true )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->stylesheet = basename( $this->theme_root ) . '/' . $this->stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->theme_root = dirname( $theme_root );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -475,7 +477,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'theme_root_uri',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $offset, $properties );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $offset, $properties, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -574,7 +576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Parent Theme',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</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 in_array( $offset, $keys );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $offset, $keys, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -661,7 +663,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the theme exists.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function exists() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes() ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes(), true ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1029,7 +1031,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Absolute path of the stylesheet directory.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_stylesheet_directory() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes(), 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-user-query.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,9 +756,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_query_clauses = $this->meta_query->get_clauses();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $orderby, array( 'login', 'nicename', 'email', 'url', 'registered' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $orderby, array( 'login', 'nicename', 'email', 'url', 'registered' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'user_' . $orderby;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'name' == $orderby || 'display_name' == $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'display_name';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -828,7 +828,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __get( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$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">@@ -843,7 +843,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return mixed Newly-set property.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __set( $name, $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $this->$name = $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">@@ -857,7 +857,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return isset( $this->$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">@@ -870,7 +870,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $name Property 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( $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $name, $this->compat_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $name, $this->compat_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->$name );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-user.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> * @param string $role Role name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function remove_role( $role ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $role, $this->roles ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $role, $this->roles, 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"> unset( $this->caps[ $role ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -750,7 +750,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Multisite super admin has all caps by definition, Unless specifically denied.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() && is_super_admin( $this->ID ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'do_not_allow', $caps ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'do_not_allow', $caps, true ) ) {
</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"> return true;
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -757,19 +757,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '_builtin' => (bool) $taxonomy->_builtin,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><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_array( 'labels', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'labels', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_taxonomy['labels'] = (array) $taxonomy->labels;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( 'cap', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'cap', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_taxonomy['cap'] = (array) $taxonomy->cap;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( 'menu', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'menu', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_taxonomy['show_in_menu'] = (bool) $_taxonomy->show_in_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 ( in_array( 'object_type', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'object_type', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_taxonomy['object_type'] = array_unique( (array) $taxonomy->object_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">@@ -902,7 +902,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"> // Merge requested $post_fields fields into $_post.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'post', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'post', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post = array_merge( $_post, $post_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $requested_fields = array_intersect_key( $post_fields, array_flip( $fields ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,9 +909,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_post = array_merge( $_post, $requested_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $all_taxonomy_fields = in_array( 'taxonomies', $fields );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $all_taxonomy_fields = in_array( 'taxonomies', $fields, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $all_taxonomy_fields || in_array( 'terms', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $all_taxonomy_fields || in_array( 'terms', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_taxonomies = get_object_taxonomies( $post['post_type'], 'names' );
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = wp_get_object_terms( $post['ID'], $post_type_taxonomies );
</span><span class="cx" style="display: block; padding: 0 10px"> $_post['terms'] = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,11 +920,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'custom_fields', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'custom_fields', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post['custom_fields'] = $this->get_custom_fields( $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 ( in_array( 'enclosure', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'enclosure', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post['enclosure'] = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $enclosures = (array) get_post_meta( $post['ID'], 'enclosure' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $enclosures ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -969,22 +969,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => get_all_post_type_supports( $post_type->name ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'labels', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'labels', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_type['labels'] = (array) $post_type->labels;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( 'cap', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'cap', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_type['cap'] = (array) $post_type->cap;
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_type['map_meta_cap'] = (bool) $post_type->map_meta_cap;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( 'menu', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'menu', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_type['menu_position'] = (int) $post_type->menu_position;
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_type['menu_icon'] = $post_type->menu_icon;
</span><span class="cx" style="display: block; padding: 0 10px"> $_post_type['show_in_menu'] = (bool) $post_type->show_in_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 ( in_array( 'taxonomies', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'taxonomies', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_post_type['taxonomies'] = get_object_taxonomies( $post_type->name, 'names' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1190,10 +1190,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'roles' => $user->roles,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'all', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'all', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_user = array_merge( $_user, $user_fields );
</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 ( in_array( 'basic', $fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'basic', $fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $basic_fields = array( 'username', 'email', 'registered', 'display_name', 'nicename' );
</span><span class="cx" style="display: block; padding: 0 10px"> $fields = array_merge( $fields, $basic_fields );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1577,7 +1577,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $term_names = $post_data['terms_names'][ $taxonomy ];
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $term_names as $term_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $term_name, $ambiguous_terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $term_name, $ambiguous_terms, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Ambiguous term name used in a hierarchical taxonomy. Please use term ID instead.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3757,7 +3757,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $statuses = get_comment_statuses();
</span><span class="cx" style="display: block; padding: 0 10px"> $statuses = array_keys( $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">- if ( ! in_array( $content_struct['status'], $statuses ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $content_struct['status'], $statuses, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Invalid comment 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">@@ -5668,7 +5668,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"> // Use wp.editPost to edit post types other than post and page.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $postdata['post_type'], array( 'post', 'page' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new IXR_Error( 401, __( 'Invalid 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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/class-wp.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $qv Query variable name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function add_query_var( $qv ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $qv, $this->public_query_vars ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $qv, $this->public_query_vars, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->public_query_vars[] = $qv;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -348,7 +348,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $this->query_vars['post_type'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $queryable_post_types = get_post_types( array( 'publicly_queryable' => true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $this->query_vars['post_type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $this->query_vars['post_type'], $queryable_post_types, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->query_vars['post_type'] );
</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">@@ -412,7 +412,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $headers = array_merge( $headers, wp_get_nocache_headers() );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $headers['Content-Type'] = get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $status, array( 403, 500, 502, 503 ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $status, array( 403, 500, 502, 503 ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $exit_required = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $this->query_vars['feed'] ) ) {
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/comment.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1385,7 +1385,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 ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return wp_trash_comment( $comment_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">@@ -2752,7 +2752,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $to_ping ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $to_ping as $tb_ping ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tb_ping = trim( $tb_ping );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $tb_ping, $pinged ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $tb_ping, $pinged, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trackback( $tb_ping, $post_title, $excerpt, $post->ID );
</span><span class="cx" style="display: block; padding: 0 10px"> $pinged[] = $tb_ping;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</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"> */
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $post_links_temp as $link_test ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If we haven't pung it already and it isn't a link to itself.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $link_test, $pung, true ) && ( url_to_postid( $link_test ) != $post->ID )
</ins><span class="cx" style="display: block; padding: 0 10px"> // Also, let's never ping local attachments.
</span><span class="cx" style="display: block; padding: 0 10px"> && ! is_local_attachment( $link_test ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $test = @parse_url( $link_test );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3117,7 +3117,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $post_types An array of post type names.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $posts[0]->post_type, $post_types, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -3162,7 +3162,7 @@
</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/comment.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $post->post_type, $post_types ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $post->post_type, $post_types, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $open;
</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="trunksrcwpincludescompatphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/compat.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/compat.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/compat.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,7 +89,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * The solution below works only for UTF-8, so in case of a different
</span><span class="cx" style="display: block; padding: 0 10px"> * charset just use built-in substr().
</span><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_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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"> * The solution below works only for UTF-8, so in case of a different charset
</span><span class="cx" style="display: block; padding: 0 10px"> * just use built-in strlen().
</span><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_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return strlen( $str );
</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="trunksrcwpincludescustomizeclasswpcustomizemediacontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-media-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-media-control.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/customize/class-wp-customize-media-control.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->setting->default ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Fake an attachment model - needs all fields used by template.
</span><span class="cx" style="display: block; padding: 0 10px"> // Note that the default value must be a URL, NOT an attachment ID.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = in_array( substr( $this->setting->default, -3 ), array( 'jpg', 'png', 'gif', 'bmp' ) ) ? 'image' : 'document';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $ext = substr( $this->setting->default, -3 );
+ $type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp' ), true ) ? 'image' : 'document';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_attachment = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 1,
</span><span class="cx" style="display: block; padding: 0 10px"> 'url' => $this->setting->default,
</span></span></pre></div>
<a id="trunksrcwpincludesembedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/embed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/embed.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/embed.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -800,7 +800,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The filtered oEmbed result.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_filter_oembed_iframe_title_attribute( $result, $data, $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ), true ) ) {
</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">@@ -854,7 +854,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The filtered and sanitized oEmbed result.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_filter_oembed_result( $result, $data, $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( false === $result || ! in_array( $data->type, array( 'rich', 'video' ), true ) ) {
</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></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/formatting.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = substr( $text, $name_offset, $space );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Handle disabled tags.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $tag, $disabled_elements ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $tag, $disabled_elements, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $opening_tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * This disables texturize until we find a closing tag of our type
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -978,7 +978,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $charset = $_charset;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $charset = 'UTF-8';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1123,7 +1123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Store the site charset as a static to avoid multiple calls to get_option().
</span><span class="cx" style="display: block; padding: 0 10px"> static $is_utf8 = null;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $is_utf8 ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ), true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $is_utf8 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $string;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2876,8 +2876,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dest = 'http://' . $dest;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Removed trailing [.,;:)] from URL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( substr( $dest, -1 ), array( '.', ',', ';', ':', ')' ) ) === true ) {
- $ret = substr( $dest, -1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $last_char = substr( $dest, -1 );
+ if ( in_array( $last_char, array( '.', ',', ';', ':', ')' ), true ) === true ) {
+ $ret = $last_char;
</ins><span class="cx" style="display: block; padding: 0 10px"> $dest = substr( $dest, 0, strlen( $dest ) - 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">@@ -3305,7 +3306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't convert smilies that aren't images - they're probably emoji.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $ext, $image_exts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $ext, $image_exts, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $img;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4311,7 +4312,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * it needs http:// prepended (unless it's a relative link
</span><span class="cx" style="display: block; padding: 0 10px"> * starting with /, # or ?, or a PHP 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 ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $url, ':' ) === false && ! in_array( $url[0], array( '/', '#', '?' ), true ) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ! preg_match( '/^[a-z0-9-]+?\.php/i', $url ) ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -4715,7 +4716,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed[] = WPLANG;
</span><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_array( $value, $allowed ) && ! empty( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, $allowed, true ) && ! empty( $value ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = get_option( $option );
</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">@@ -4763,7 +4764,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'timezone_string':
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_zones = timezone_identifiers_list();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $value, $allowed_zones, true ) && ! empty( $value ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
</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">@@ -5145,7 +5146,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $_links_add_base;
</span><span class="cx" style="display: block; padding: 0 10px"> // 1 = attribute name 2 = quotation mark 3 = URL.
</span><span class="cx" style="display: block; padding: 0 10px"> return $m[1] . '=' . $m[2] .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols(), true ) ?
</ins><span class="cx" style="display: block; padding: 0 10px"> $m[3] :
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Http::make_absolute_url( $m[3], $_links_add_base )
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/functions.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2734,7 +2734,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ext2type = wp_get_ext_types();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $ext2type as $type => $exts ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $ext, $exts ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $ext, $exts, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -2881,7 +2881,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $real_mime, $nonspecific_types, true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // File is a non-specific binary type. That's ok if it's a type that generally tends to be binary.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( substr( $type, 0, strcspn( $type, '/' ) ), array( 'application', 'video', 'audio' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2905,7 +2905,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/richtext',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/tsv',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/vtt',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2919,7 +2920,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/rtf',
</span><span class="cx" style="display: block; padding: 0 10px"> 'text/plain',
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/rtf',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ true
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2941,7 +2943,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed = get_allowed_mime_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">- if ( ! in_array( $type, $allowed ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $type, $allowed, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $ext = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5235,7 +5237,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( function_exists( 'apache_get_modules' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mods = apache_get_modules();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $mod, $mods ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $mod, $mods, true ) ) {
</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"> } elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5317,7 +5319,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"> // Files not in the allowed file list are not allowed:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 3;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5728,7 +5730,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $zonen = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( timezone_identifiers_list() as $zone ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $zone = explode( '/', $zone );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $zone[0], $continents ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $zone[0], $continents, 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6316,9 +6318,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $caller[] = "{$call['class']}{$call['type']}{$call['function']}";
</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 ( in_array( $call['function'], array( 'do_action', 'apply_filters', 'do_action_ref_array', 'apply_filters_ref_array' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $call['function'], array( 'do_action', 'apply_filters', 'do_action_ref_array', 'apply_filters_ref_array' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $caller[] = "{$call['function']}('{$call['args'][0]}')";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filename = isset( $call['args'][0] ) ? $call['args'][0] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $caller[] = $call['function'] . "('" . str_replace( $truncate_paths, '', wp_normalize_path( $filename ) ) . "')";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6447,7 +6449,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $screen = get_current_screen();
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $show = ! in_array( $screen->id, $hidden );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $show = ! in_array( $screen->id, $hidden, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters whether to load the authentication check.
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionswpscriptsphp"></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.wp-scripts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.wp-scripts.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/functions.wp-scripts.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,7 +249,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> ( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $no = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $not_allowed = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'jquery',
</span><span class="cx" style="display: block; padding: 0 10px"> 'jquery-core',
</span><span class="cx" style="display: block; padding: 0 10px"> 'jquery-migrate',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -277,7 +277,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'backbone',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><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_array( $handle, $no ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $handle, $not_allowed, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Script name, 2: wp_enqueue_scripts */
</span><span class="cx" style="display: block; padding: 0 10px"> __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/general-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3233,7 +3233,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 ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parsed = wp_parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $parsed['host'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3258,8 +3258,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $html = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as $attr => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_scalar( $value ) ||
- ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_scalar( $value )
+ || ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ) )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3303,7 +3304,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dependency = $dependencies->registered[ $handle ];
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = wp_parse_url( $dependency->src );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $parsed['host'] )
+ && ! in_array( $parsed['host'], $unique_hosts, true ) && $parsed['host'] !== $_SERVER['SERVER_NAME']
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $unique_hosts[] = $parsed['host'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3371,7 +3374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $r = user_can_richedit() ? 'tinymce' : 'html'; // Defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( wp_get_current_user() ) { // Look for cookie.
</span><span class="cx" style="display: block; padding: 0 10px"> $ed = get_user_setting( 'editor', 'tinymce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $r = ( in_array( $ed, array( 'tinymce', 'html', 'test' ) ) ) ? $ed : $r;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $r = ( in_array( $ed, array( 'tinymce', 'html', 'test' ), true ) ) ? $ed : $r;
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/http.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,7 +459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $origin = get_http_origin();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $origin && ! in_array( $origin, get_allowed_http_origins(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $origin = '';
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/kses.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -793,7 +793,7 @@
</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><span class="cx" style="display: block; padding: 0 10px"> // Sanitize URI values.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtolower( $name ), $uris ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtolower( $name ), $uris, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = wp_kses_bad_protocol( $value, $allowed_protocols );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1285,7 +1285,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '%^"([^"]*)"(\s+|/?$)%', $attr, $match ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // "value"
</span><span class="cx" style="display: block; padding: 0 10px"> $thisval = $match[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtolower( $attrname ), $uris ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1306,7 +1306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( "%^'([^']*)'(\s+|/?$)%", $attr, $match ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // 'value'
</span><span class="cx" style="display: block; padding: 0 10px"> $thisval = $match[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtolower( $attrname ), $uris ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1327,7 +1327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( "%^([^\s\"']+)(\s+|/?$)%", $attr, $match ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // value
</span><span class="cx" style="display: block; padding: 0 10px"> $thisval = $match[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtolower( $attrname ), $uris ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtolower( $attrname ), $uris, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $thisval = wp_kses_bad_protocol( $thisval, $allowed_protocols );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1782,7 +1782,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"> $i = $matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return ( ! in_array( $i, $allowedentitynames ) ) ? "&$i;" : "&$i;";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ( ! in_array( $i, $allowedentitynames, true ) ) ? "&$i;" : "&$i;";
</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="trunksrcwpincludesl10nphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/l10n.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/l10n.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/l10n.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1208,12 +1208,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mofile = "{$domain}-{$locale}.mo";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $path = WP_LANG_DIR . '/plugins/' . $mofile;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $path, $cached_mofiles ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $path, $cached_mofiles, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $path;
</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"> $path = WP_LANG_DIR . '/themes/' . $mofile;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $path, $cached_mofiles ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $path, $cached_mofiles, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -1366,7 +1366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files, 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">
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/link-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> return get_page_link( $post, $leavename, $sample );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'attachment' === $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_attachment_link( $post, $leavename );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( in_array( $post->post_type, get_post_types( array( '_builtin' => false ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( in_array( $post->post_type, get_post_types( array( '_builtin' => false ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_post_permalink( $post, $leavename, $sample );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</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' ) ) ) {
</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">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $post->post_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">- $draft_or_pending = get_post_status( $post ) && in_array( get_post_status( $post ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $draft_or_pending = get_post_status( $post ) && in_array( get_post_status( $post ), 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"> $post_type = get_post_type_object( $post->post_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -371,7 +371,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ), true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $wp_rewrite->get_page_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -417,7 +417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent && ! in_array( $parent->post_type, get_post_types(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent = 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">@@ -3182,7 +3182,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> restore_current_blog();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $scheme = 'https';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3497,7 +3497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_network = get_network();
</span><span class="cx" style="display: block; padding: 0 10px"> $orig_scheme = $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 ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ), true ) ) {
</ins><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></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/load.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -14,7 +14,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_server_protocol() {
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = isset( $_SERVER['SERVER_PROTOCOL'] ) ? $_SERVER['SERVER_PROTOCOL'] : '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $protocol = 'HTTP/1.0';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $protocol;
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $input as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $k, $no_unset ) && isset( $GLOBALS[ $k ] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $k, $no_unset, true ) && isset( $GLOBALS[ $k ] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $GLOBALS[ $k ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -683,7 +683,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'.
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins, true ) )
</ins><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="cx" style="display: block; padding: 0 10px"> }
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/ms-blogs.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -703,7 +703,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( __FUNCTION__, '3.1.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 ( ! in_array( $pref, array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pref_whitelist = array( 'site_id', 'domain', 'path', 'registered', 'last_updated', 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' );
+
+ if ( ! in_array( $pref, $pref_whitelist, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/ms-functions.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -488,7 +488,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_site_option( 'illegal_names', $illegal_names );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $user_name, $illegal_names ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $user_name, $illegal_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'user_name', __( 'Sorry, that username is not allowed.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -653,7 +653,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $blogname, $illegal_names ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $blogname, $illegal_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'blogname', __( 'That name is not allowed.' ) );
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/nav-menu-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Default is array containing 'div' and 'nav'.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_tags = apply_filters( 'wp_nav_menu_container_allowedtags', array( 'div', 'nav' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( is_string( $args->container ) && in_array( $args->container, $allowed_tags, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $show_container = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $class = $args->container_class ? ' class="' . esc_attr( $args->container_class ) . '"' : ' class="menu-' . $menu->slug . '-container"';
</span><span class="cx" style="display: block; padding: 0 10px"> $id = $args->container_id ? ' id="' . esc_attr( $args->container_id ) . '"' : '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -223,7 +224,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wrap_id = $args->menu_id;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $wrap_id = 'menu-' . $menu->slug;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( in_array( $wrap_id, $menu_id_slugs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ while ( in_array( $wrap_id, $menu_id_slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '#-(\d+)$#', $wrap_id, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wrap_id = preg_replace( '#-(\d+)$#', '-' . ++$matches[1], $wrap_id );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,11 +399,12 @@
</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 or taxonomy object.
</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">- $menu_item->object_id == $queried_object_id &&
- (
- ( ! 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 && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_item->object_id == $queried_object_id
+ && (
+ ( ! 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
+ && ( $wp_query->is_category || $wp_query->is_tag || $wp_query->is_tax ) && $queried_object->taxonomy == $menu_item->object )
</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"> $classes[] = 'current-menu-item';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -409,8 +412,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_anc_id = (int) $menu_item->db_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
- ! in_array( $_anc_id, $active_ancestor_item_ids )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $_anc_id = (int) get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) )
+ && ! in_array( $_anc_id, $active_ancestor_item_ids, true )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -428,8 +431,8 @@
</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 &&
- is_post_type_archive( array( $menu_item->object ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type_archive' == $menu_item->type
+ && is_post_type_archive( array( $menu_item->object ) )
</ins><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="cx" style="display: block; padding: 0 10px"> $menu_items[ $key ]->current = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,8 +439,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_anc_id = (int) $menu_item->db_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
- ! in_array( $_anc_id, $active_ancestor_item_ids )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $_anc_id = (int) get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) )
+ && ! in_array( $_anc_id, $active_ancestor_item_ids, true )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -467,19 +470,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> urldecode( $_root_relative_current ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><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_item_url && in_array( $item_url, $matches ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $raw_item_url && in_array( $item_url, $matches, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current-menu-item';
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items[ $key ]->current = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $_anc_id = (int) $menu_item->db_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( $_anc_id = get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) ) &&
- ! in_array( $_anc_id, $active_ancestor_item_ids )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( $_anc_id = (int) get_post_meta( $_anc_id, '_menu_item_menu_item_parent', true ) )
+ && ! in_array( $_anc_id, $active_ancestor_item_ids, true )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</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 ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( home_url(), array( untrailingslashit( $current_url ), untrailingslashit( $_indexless_current ) ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Back compat for home link to match wp_page_menu().
</span><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current_page_item';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,23 +518,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_items[ $key ]->current_item_parent = false;
</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">- isset( $parent_item->type ) &&
- (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ isset( $parent_item->type )
+ && (
</ins><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 &&
- ! empty( $queried_object->post_type ) &&
- is_post_type_hierarchical( $queried_object->post_type ) &&
- in_array( $parent_item->object_id, $queried_object->ancestors ) &&
- $parent_item->object != $queried_object->ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_type' == $parent_item->type
+ && ! empty( $queried_object->post_type )
+ && is_post_type_hierarchical( $queried_object->post_type )
+ && in_array( $parent_item->object_id, $queried_object->ancestors )
+ && $parent_item->object != $queried_object->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"> // 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 &&
- isset( $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
- in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] ) &&
- (
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'taxonomy' == $parent_item->type
+ && isset( $possible_taxonomy_ancestors[ $parent_item->object ] )
+ && in_array( $parent_item->object_id, $possible_taxonomy_ancestors[ $parent_item->object ] )
+ && (
</ins><span class="cx" style="display: block; padding: 0 10px"> ! isset( $queried_object->term_id ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_item->object_id != $queried_object->term_id
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,27 +541,33 @@
</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">- $classes[] = empty( $queried_object->taxonomy ) ? 'current-' . $queried_object->post_type . '-ancestor' : 'current-' . $queried_object->taxonomy . '-ancestor';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $queried_object->taxonomy ) ) {
+ $classes[] = 'current-' . $queried_object->taxonomy . '-ancestor';
+ } else {
+ $classes[] = 'current-' . $queried_object->post_type . '-ancestor';
+ }
</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">- if ( in_array( intval( $parent_item->db_id ), $active_ancestor_item_ids ) ) {
- $classes[] = 'current-menu-ancestor';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (int) $parent_item->db_id, $active_ancestor_item_ids, true ) ) {
+ $classes[] = 'current-menu-ancestor';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_items[ $key ]->current_item_ancestor = 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 ( in_array( $parent_item->db_id, $active_parent_item_ids ) ) {
- $classes[] = 'current-menu-parent';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (int) $parent_item->db_id, $active_parent_item_ids, true ) ) {
+ $classes[] = 'current-menu-parent';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu_items[ $key ]->current_item_parent = 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 ( in_array( $parent_item->object_id, $active_parent_object_ids ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( (int) $parent_item->object_id, $active_parent_object_ids, true ) ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_type' == $parent_item->type && 'page' == $parent_item->object ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Back compat classes for pages to match wp_page_menu().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'current-menu-parent', $classes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'current-menu-parent', $classes, true ) ) {
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'current-menu-ancestor', $classes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'current-menu-ancestor', $classes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $classes[] = 'current_page_ancestor';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -597,9 +606,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _nav_menu_item_id_use_once( $id, $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> static $_used_ids = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $item->ID, $_used_ids ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( in_array( $item->ID, $_used_ids, true ) ) {
</ins><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"> $_used_ids[] = $item->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"> return $id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/option.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> 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 ( in_array( $option, array( 'siteurl', 'home', 'category_base', 'tag_base' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $option, array( 'siteurl', 'home', 'category_base', 'tag_base' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = untrailingslashit( $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">@@ -1772,7 +1772,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
</span><span class="cx" style="display: block; padding: 0 10px"> $no_timeout = array( 'update_core', 'update_plugins', 'update_themes' );
</span><span class="cx" style="display: block; padding: 0 10px"> $transient_option = '_site_transient_' . $transient;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $transient, $no_timeout ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $transient, $no_timeout, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $transient_timeout = '_site_transient_timeout_' . $transient;
</span><span class="cx" style="display: block; padding: 0 10px"> $timeout = get_site_option( $transient_timeout );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $timeout && $timeout < time() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2232,7 +2232,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $option_group = 'reading';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ], true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $pos ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $new_whitelist_options[ $option_group ][ $pos ] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/pluggable.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -454,7 +454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $headers ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $headers as $name => $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only add custom headers not added automatically by PHPMailer.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $name, array( 'MIME-Version', 'X-Mailer' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -546,7 +546,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ignore_codes = array( 'empty_username', 'empty_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 ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_wp_error( $user ) && ! in_array( $user->get_error_code(), $ignore_codes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $error = $user;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1465,7 +1465,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array( $wpp['host'] ), isset( $lp['host'] ) ? $lp['host'] : '' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $lp['host'] ) && ( ! in_array( $lp['host'], $allowed_hosts, true ) && strtolower( $wpp['host'] ) !== $lp['host'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = $default;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2271,7 +2271,7 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'key', 'salt' ) as $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $const = strtoupper( "{$scheme}_{$type}" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/plugin.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return ! empty( $wp_current_filter );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 in_array( $filter, $wp_current_filter );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $filter, $wp_current_filter, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/post-formats.php 2020-04-05 03:00:44 UTC (rev 47550)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $format ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $format = sanitize_key( $format );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs() ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'standard' === $format || ! in_array( $format, get_post_format_slugs(), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $format = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $format = 'post-format-' . $format;
</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"> * @return array
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( 'post_format', (array) $taxonomies ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( 'post_format', (array) $taxonomies, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $args['fields'] ) && 'names' == $args['fields'] ) {
</span><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></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/post-template.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1032,7 +1032,7 @@
</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' ) ) ) {
</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><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_on_front' ) == $post->ID ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -1395,7 +1395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = wp_parse_args( $args, $defaults );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $args['item_spacing'], array( 'preserve', 'discard' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Invalid value, fall back to default.
</span><span class="cx" style="display: block; padding: 0 10px"> $args['item_spacing'] = $defaults['item_spacing'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1811,7 +1811,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $revision;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $revision->post_type, array( 'post', 'page', 'revision' ), true ) ) {
</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">@@ -1852,7 +1852,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $revision;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $revision->post_type, array( 'post', 'page', 'revision' ), true ) ) {
</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="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/post.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -815,7 +815,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> while ( $ancestor = get_post( $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop detection: If the ancestor has been seen before, break.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors, true ) ) {
</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">@@ -1616,7 +1616,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $post_type_meta_caps;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $capabilities as $core => $custom ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type_meta_caps[ $custom ] = $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">@@ -2362,13 +2362,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array( 'ID', 'post_parent', 'menu_order' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $field, $int_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, $int_fields, true ) ) {
</ins><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><span class="cx" style="display: block; padding: 0 10px"> // Fields which contain arrays of integers.
</span><span class="cx" style="display: block; padding: 0 10px"> $array_int_fields = array( 'ancestors' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $field, $array_int_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, $array_int_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = array_map( 'absint', $value );
</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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2417,7 +2417,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = apply_filters( "edit_post_{$field}", $value, $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 ( in_array( $field, $format_to_edit ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, $format_to_edit, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'post_content' == $field ) {
</span><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="lines" style="display: block; padding: 0 10px; color: #888">@@ -2778,7 +2778,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_types = wp_get_mime_types();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_mime_types as $group => $labels ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $group, array( 'image', 'audio', 'video' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $group, array( 'image', 'audio', 'video' ), 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2904,7 +2904,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_pattern = preg_replace( '/\*+/', '%', $mime_pattern );
</span><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_array( $mime_type, $wildcards ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $mime_type, $wildcards, 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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3697,7 +3697,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * an empty post name.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_name ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_name = sanitize_title( $post_title );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_name = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3946,7 +3946,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where = 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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
</span><span class="cx" style="display: block; padding: 0 10px"> clean_post_cache( $post_ID );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4199,8 +4199,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"> // Drafts shouldn't be assigned a date unless explicitly done so by the user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $post['post_status'] ) && in_array( $post['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) && 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">+ if ( isset( $post['post_status'] )
+ && in_array( $post['post_status'], array( 'draft', 'pending', 'auto-draft' ), true )
+ && empty( $postarr['edit_date'] ) && ( '0000-00-00 00:00:00' == $post['post_date_gmt'] )
+ ) {
</ins><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="cx" style="display: block; padding: 0 10px"> $clear_date = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4330,7 +4332,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) || 'user_request' === $post_type ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ), true )
+ || ( 'inherit' == $post_status && 'revision' == $post_type ) || 'user_request' === $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">@@ -4376,7 +4380,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $bad_slug Whether the slug would be bad as an attachment slug.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug The post 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">- if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_bad_attachment_slug = apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug );
+
+ if ( $post_name_check
+ || in_array( $slug, $feeds, true ) || 'embed' === $slug
+ || $is_bad_attachment_slug
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4407,7 +4416,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type Post type.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $post_parent Post parent ID.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug ) || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_bad_hierarchical_slug = apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent );
+
+ if ( $post_name_check
+ || in_array( $slug, $feeds, true ) || 'embed' === $slug
+ || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )
+ || $is_bad_hierarchical_slug
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4456,7 +4471,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $slug The post slug.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_type 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_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $is_bad_flat_slug = apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type );
+
+ if ( $post_name_check
+ || in_array( $slug, $feeds, true ) || 'embed' === $slug
+ || $conflicts_with_date_archive
+ || $is_bad_flat_slug
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5265,7 +5286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the post type is hierarchical.
</span><span class="cx" style="display: block; padding: 0 10px"> $hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $parsed_args['post_type'], $hierarchical_post_types ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $parsed_args['post_type'], $hierarchical_post_types, true ) ) {
</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">@@ -5403,7 +5424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( explode( ',', $parsed_args['sort_column'] ) as $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $orderby = trim( $orderby );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $orderby, $allowed_keys ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $orderby, $allowed_keys, 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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5433,7 +5454,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sort_order = strtoupper( $parsed_args['sort_order'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sort_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">@@ -6069,13 +6090,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'image':
</span><span class="cx" style="display: block; padding: 0 10px"> $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $ext, $image_exts );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $ext, $image_exts, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'audio':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $ext, wp_get_audio_extensions() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $ext, wp_get_audio_extensions(), true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'video':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $ext, wp_get_video_extensions() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $ext, wp_get_video_extensions(), true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> default:
</span><span class="cx" style="display: block; padding: 0 10px"> return $type === $ext;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6179,7 +6200,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( substr( $file, 0, 1 ) == '.' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( strtolower( substr( $file, -4 ) ), array( '.png', '.gif', '.jpg' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $ext = strtolower( substr( $file, -4 ) );
+ if ( ! in_array( $ext, array( '.png', '.gif', '.jpg' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( is_dir( "$dir/$file" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs[ "$dir/$file" ] = "$uri/$file";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6269,12 +6292,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we haven't added this old slug before, add it now.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, '_wp_old_slug', $post_before->post_name );
</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 new slug was used previously, delete it from the list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $post->post_name, $old_slugs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $post->post_name, $old_slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_old_slug', $post->post_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">@@ -6301,21 +6324,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_check_for_changed_dates( $post_id, $post, $post_before ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_date = gmdate( 'Y-m-d', strtotime( $post_before->post_date ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_date = gmdate( 'Y-m-d', strtotime( $post->post_date ) );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Don't bother if it hasn't changed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $new_date == $previous_date ) {
</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"> // We're only concerned with published, non-hierarchical objects.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
</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"> $old_dates = (array) get_post_meta( $post_id, '_wp_old_date' );
</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 we haven't added this old date before, add it now.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $previous_date ) && ! in_array( $previous_date, $old_dates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $previous_date ) && ! in_array( $previous_date, $old_dates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> add_post_meta( $post_id, '_wp_old_date', $previous_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"> // If the new slug was used previously, delete it from the list.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $new_date, $old_dates ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $new_date, $old_dates, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> delete_post_meta( $post_id, '_wp_old_date', $new_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">@@ -6524,7 +6552,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $field, array( 'date', 'modified' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $field, array( 'date', 'modified' ), true ) ) {
</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="trunksrcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/rest-api.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1322,7 +1322,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 ( in_array( $args['type'], array( 'integer', 'number' ) ) && ! is_numeric( $value ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $args['type'], array( 'integer', 'number' ), true ) && ! is_numeric( $value ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: Parameter, 2: Type name. */
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'rest_invalid_param', sprintf( __( '%1$s is not of type %2$s.' ), $param, $args['type'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/rewrite.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> function add_feed( $feedname, $function ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_rewrite;
</span><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_array( $feedname, $wp_rewrite->feeds ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $feedname, $wp_rewrite->feeds, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->feeds[] = $feedname;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Identify the 'postname' position in the permastruct array.
</span><span class="cx" style="display: block; padding: 0 10px"> $permastructs = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $postname_index = array_search( '%postname%', $permastructs );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $postname_index = array_search( '%postname%', $permastructs, true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $postname_index ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $query_vars;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -596,7 +596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parse_str( $query, $query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> $query = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $query_vars as $key => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $key, $wp->public_query_vars ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key, $wp->public_query_vars, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query[ $key ] = $value;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $post_type_query_vars[ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $query['post_type'] = $post_type_query_vars[ $key ];
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/taxonomy.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,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 ( ! in_array( $object_type, $wp_taxonomies[ $taxonomy ]->object_type ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $object_type, $wp_taxonomies[ $taxonomy ]->object_type, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_taxonomies[ $taxonomy ]->object_type[] = $object_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">@@ -1526,7 +1526,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_term_field( $field, $value, $term_id, $taxonomy, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array( 'parent', 'term_id', 'count', 'term_group', 'term_taxonomy_id', 'object_id' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $field, $int_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, $int_fields, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = (int) $value;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $value < 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2236,9 +2236,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"> $existing_term = null;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, wp_list_pluck( $siblings, 'name' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $sibling_names = wp_list_pluck( $siblings, 'name' );
+ $sibling_slugs = wp_list_pluck( $siblings, 'slug' );
+
+ if ( ( ! $slug_provided || $name_match->slug === $slug ) && in_array( $name, $sibling_names, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $existing_term = $name_match;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $slug_match && in_array( $slug, wp_list_pluck( $siblings, 'slug' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $slug_match && in_array( $slug, $sibling_slugs, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $existing_term = $slug_match;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3700,7 +3703,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $object_types = array_unique( $object_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">- $check_attachments = array_search( 'attachment', $object_types );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $check_attachments = array_search( 'attachment', $object_types, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $check_attachments ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $object_types[ $check_attachments ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $check_attachments = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4445,7 +4448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $object_terms as $object_term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If term is an int, check against term_ids only.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $ints && in_array( $object_term->term_id, $ints ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $ints && in_array( $object_term->term_id, $ints, true ) ) {
</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">@@ -4456,10 +4459,10 @@
</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 ( in_array( $object_term->name, $strs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $object_term->name, $strs, true ) ) {
</ins><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 ( in_array( $object_term->slug, $strs ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $object_term->slug, $strs, true ) ) {
</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">@@ -4482,7 +4485,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $taxonomies ) ) {
</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">- return in_array( $taxonomy, $taxonomies );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $taxonomy, $taxonomies, true );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/theme.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,7 +48,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_theme = get_stylesheet();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme_directories[ $current_theme ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $root_of_current_theme = get_raw_theme_root( $current_theme );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $root_of_current_theme, $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $root_of_current_theme, $wp_theme_directories, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $root_of_current_theme = WP_CONTENT_DIR . $root_of_current_theme;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_directories[ $current_theme ]['theme_root'] = $root_of_current_theme;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = get_raw_theme_root( $stylesheet );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $theme_root ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root = WP_CONTENT_DIR . '/themes';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
</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">@@ -411,7 +411,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"> $untrailed = untrailingslashit( $directory );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $untrailed ) && ! in_array( $untrailed, $wp_theme_directories, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wp_theme_directories[] = $untrailed;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -583,7 +583,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $theme_root ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Always prepend WP_CONTENT_DIR unless the root currently registered as a theme directory.
</span><span class="cx" style="display: block; padding: 0 10px"> // This gives relative theme roots the benefit of the doubt when things go haywire.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $theme_root, (array) $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
</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">@@ -626,7 +626,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 ( $stylesheet_or_template && $theme_root ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $theme_root, (array) $wp_theme_directories ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $theme_root, (array) $wp_theme_directories, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Absolute path. Make an educated guess. YMMV -- but note the filter below.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === strpos( $theme_root, WP_CONTENT_DIR ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_root_uri = content_url( str_replace( WP_CONTENT_DIR, '', $theme_root ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2738,7 +2738,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function remove_theme_support( $feature ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Blacklist: for internal registrations not used directly by themes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $feature, array( 'editor-style', 'widgets', 'menus' ), true ) ) {
</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">@@ -2846,11 +2846,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * by passing an array of types to add_theme_support().
</span><span class="cx" style="display: block; padding: 0 10px"> * If no array was passed, then any type is accepted.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( true === $_wp_theme_features[ $feature ] ) { // Registered for all types
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( true === $_wp_theme_features[ $feature ] ) { // Registered for all types.
</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"> $content_type = $args[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $content_type, $_wp_theme_features[ $feature ][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $content_type, $_wp_theme_features[ $feature ][0], true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'html5':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'post-formats':
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2861,7 +2861,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Specific areas of HTML5 support *must* be passed via an array to add_theme_support().
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $type = $args[0];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return in_array( $type, $_wp_theme_features[ $feature ][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return in_array( $type, $_wp_theme_features[ $feature ][0], true );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'custom-logo':
</span><span class="cx" style="display: block; padding: 0 10px"> case 'custom-header':
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></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/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/update.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -672,7 +672,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $core = current_user_can( 'update_core' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $core && function_exists( 'get_core_updates' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $update_wordpress = get_core_updates( array( 'dismissed' => false ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $update_wordpress ) && ! in_array( $update_wordpress[0]->response, array( 'development', 'latest' ) ) && current_user_can( 'update_core' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $update_wordpress )
+ && ! in_array( $update_wordpress[0]->response, array( 'development', 'latest' ), true )
+ && current_user_can( 'update_core' )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $counts['wordpress'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/user.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1238,7 +1238,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_user_field( $field, $value, $user_id, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $int_fields = array( 'ID' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $field, $int_fields ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $field, $int_fields, true ) ) {
</ins><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3111,7 +3111,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $session_tokens_props_to_export as $key => $name ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $session_token[ $key ] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $session_token[ $key ];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $key, array( 'expiration', 'login' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $key, array( 'expiration', 'login' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = date_i18n( 'F d, Y H:i A', $value );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $session_tokens_data_to_export[] = array(
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetlinksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-links.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-links.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['orderby'] = 'name';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $new_instance['orderby'], array( 'name', 'rating', 'id', 'rand' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['orderby'] = $new_instance['orderby'];
</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="trunksrcwpincludeswidgetsclasswpwidgetpagesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-pages.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-pages.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/widgets/class-wp-widget-pages.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> public function update( $new_instance, $old_instance ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance = $old_instance;
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['title'] = sanitize_text_field( $new_instance['title'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $new_instance['sortby'], array( 'post_title', 'menu_order', 'ID' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $instance['sortby'] = $new_instance['sortby'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['sortby'] = 'menu_order';
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetrssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-rss.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-rss.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/widgets/class-wp-widget-rss.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Self-URL destruction sequence.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( untrailingslashit( $url ), array( site_url(), home_url() ), 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="trunksrcwpincludeswpdbphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-includes/wp-db.php 2020-04-05 03:00:44 UTC (rev 47550)
</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"> $incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $modes as $i => $mode ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $mode, $incompatible_modes ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $mode, $incompatible_modes, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $modes[ $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">@@ -1039,7 +1039,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $base_prefix = $this->base_prefix;
</span><span class="cx" style="display: block; padding: 0 10px"> $global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $tables as $k => $table ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( $table, $global_tables ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $table, $global_tables, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tables[ $table ] = $base_prefix . $table;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $tables[ $table ] = $blog_prefix . $table;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2209,7 +2209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->insert_id = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ), true ) ) {
</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">@@ -2743,7 +2743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> list( $type ) = explode( '(', $column->Type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // A binary/blob means the whole query gets treated like this.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->table_charset[ $tablekey ] = 'binary';
</span><span class="cx" style="display: block; padding: 0 10px"> return 'binary';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2020-04-04 22:52:30 UTC (rev 47549)
+++ trunk/src/wp-signup.php 2020-04-05 03:00:44 UTC (rev 47550)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,7 +9,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> nocache_headers();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_array( get_site_option( 'illegal_names' ) ) && isset( $_GET['new'] ) && in_array( $_GET['new'], get_site_option( 'illegal_names' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_array( get_site_option( 'illegal_names' ) ) && isset( $_GET['new'] ) && in_array( $_GET['new'], get_site_option( 'illegal_names' ), true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_home_url() );
</span><span class="cx" style="display: block; padding: 0 10px"> die();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -169,7 +169,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"> // Use US English if the default isn't available.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! in_array( $lang, $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! in_array( $lang, $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $lang = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -438,7 +438,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $languages = signup_get_available_languages();
</span><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_array( $_POST['WPLANG'], $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $_POST['WPLANG'], $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $language ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -789,7 +789,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $languages = signup_get_available_languages();
</span><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_array( $_POST['WPLANG'], $languages ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $_POST['WPLANG'], $languages, true ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $language = wp_unslash( sanitize_text_field( $_POST['WPLANG'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $language ) {
</span></span></pre>
</div>
</div>
</body>
</html>