<!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>[55988] trunk/src: Code Modernization: Replace usage of `strpos()` with `str_contains()`.</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/55988">55988</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/55988","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>2023-06-22 14:34:56 +0000 (Thu, 22 Jun 2023)</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'>Code Modernization: Replace usage of `strpos()` with `str_contains()`.
`str_contains()` was introduced in PHP 8.0 to perform a case-sensitive check indicating if the string to search in (haystack) contains the given substring (needle).
WordPress core includes a polyfill for `str_contains()` on PHP < 8.0 as of WordPress 5.9.
This commit replaces `false !== strpos( ... )` with `str_contains()` in core files, making the code more readable and consistent, as well as better aligned with modern development practices.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52039">[52039]</a>, <a href="https://core.trac.wordpress.org/changeset/52040">[52040]</a>, <a href="https://core.trac.wordpress.org/changeset/52326">[52326]</a>, <a href="https://core.trac.wordpress.org/changeset/55703">[55703]</a>, <a href="https://core.trac.wordpress.org/changeset/55710">[55710]</a>, <a href="https://core.trac.wordpress.org/changeset/55987">[55987]</a>.
Props Soean, spacedmonkey, costdev, dingo_d, azaozz, mikeschroder, flixos90, peterwilsoncc, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/58206">#58206</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincommentphp">trunk/src/wp-admin/comment.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="#trunksrcwpadminincludesclassautomaticupgraderskinphp">trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclassbulkupgraderskinphp">trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscoreupgraderphp">trunk/src/wp-admin/includes/class-core-upgrader.php</a></li>
<li><a href="#trunksrcwpadminincludesclasscustomimageheaderphp">trunk/src/wp-admin/includes/class-custom-image-header.php</a></li>
<li><a href="#trunksrcwpadminincludesclassftpphp">trunk/src/wp-admin/includes/class-ftp.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpajaxupgraderskinphp">trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpautomaticupdaterphp">trunk/src/wp-admin/includes/class-wp-automatic-updater.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-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="#trunksrcwpadminincludesclasswpsitehealthautoupdatesphp">trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpsitehealthphp">trunk/src/wp-admin/includes/class-wp-site-health.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpupgraderskinphp">trunk/src/wp-admin/includes/class-wp-upgrader-skin.php</a></li>
<li><a href="#trunksrcwpadminincludescreditsphp">trunk/src/wp-admin/includes/credits.php</a></li>
<li><a href="#trunksrcwpadminincludesdeprecatedphp">trunk/src/wp-admin/includes/deprecated.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesmiscphp">trunk/src/wp-admin/includes/misc.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludesprivacytoolsphp">trunk/src/wp-admin/includes/privacy-tools.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#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="#trunksrcwpadminincludesuserphp">trunk/src/wp-admin/includes/user.php</a></li>
<li><a href="#trunksrcwpadminmenuheaderphp">trunk/src/wp-admin/menu-header.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworkthemesphp">trunk/src/wp-admin/network/themes.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunksrcwpadminoptionsphp">trunk/src/wp-admin/options.php</a></li>
<li><a href="#trunksrcwpadminpostphp">trunk/src/wp-admin/post.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpadminusereditphp">trunk/src/wp-admin/user-edit.php</a></li>
<li><a href="#trunksrcwpadminusernewphp">trunk/src/wp-admin/user-new.php</a></li>
<li><a href="#trunksrcwpadminwidgetsformphp">trunk/src/wp-admin/widgets-form.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninciconfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentaudiophp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentvideophp">trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentycommentsphp">trunk/src/wp-content/themes/twentytwenty/comments.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyfunctionsphp">trunk/src/wp-content/themes/twentytwenty/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentytemplatepartspaginationphp">trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyoneinctemplatefunctionsphp">trunk/src/wp-content/themes/twentytwentyone/inc/template-functions.php</a></li>
<li><a href="#trunksrcwpincludesblocksupportsduotonephp">trunk/src/wp-includes/block-supports/duotone.php</a></li>
<li><a href="#trunksrcwpincludesblocktemplatephp">trunk/src/wp-includes/block-template.php</a></li>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcommentqueryphp">trunk/src/wp-includes/class-wp-comment-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.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="#trunksrcwpincludesclasswphttpproxyphp">trunk/src/wp-includes/class-wp-http-proxy.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpphp">trunk/src/wp-includes/class-wp-http.php</a></li>
<li><a href="#trunksrcwpincludesclasswpmetaqueryphp">trunk/src/wp-includes/class-wp-meta-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpoembedphp">trunk/src/wp-includes/class-wp-oembed.php</a></li>
<li><a href="#trunksrcwpincludesclasswpposttypephp">trunk/src/wp-includes/class-wp-post-type.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswprewritephp">trunk/src/wp-includes/class-wp-rewrite.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.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="#trunksrcwpincludesclasswpdbphp">trunk/src/wp-includes/class-wpdb.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludescommentphp">trunk/src/wp-includes/comment.php</a></li>
<li><a href="#trunksrcwpincludescronphp">trunk/src/wp-includes/cron.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesglobalstylesandsettingsphp">trunk/src/wp-includes/global-styles-and-settings.php</a></li>
<li><a href="#trunksrcwpincludeshttpsdetectionphp">trunk/src/wp-includes/https-detection.php</a></li>
<li><a href="#trunksrcwpincludesksesphp">trunk/src/wp-includes/kses.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsfilesphp">trunk/src/wp-includes/ms-files.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespomopophp">trunk/src/wp-includes/pomo/po.php</a></li>
<li><a href="#trunksrcwpincludesposttemplatephp">trunk/src/wp-includes/post-template.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrestapiclasswprestrequestphp">trunk/src/wp-includes/rest-api/class-wp-rest-request.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestautosavescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestpluginscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludesshortcodesphp">trunk/src/wp-includes/shortcodes.php</a></li>
<li><a href="#trunksrcwpincludestemplatephp">trunk/src/wp-includes/template.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludesvarsphp">trunk/src/wp-includes/vars.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgettextphp">trunk/src/wp-includes/widgets/class-wp-widget-text.php</a></li>
<li><a href="#trunksrcwploadphp">trunk/src/wp-load.php</a></li>
<li><a href="#trunksrcwploginphp">trunk/src/wp-login.php</a></li>
<li><a href="#trunksrcwpmailphp">trunk/src/wp-mail.php</a></li>
<li><a href="#trunksrcwptrackbackphp">trunk/src/wp-trackback.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/comment.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,7 +282,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> comment_footer_die( __( 'Sorry, you are not allowed to edit comments on this post.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( wp_get_referer() && ! $noredir && false === strpos( wp_get_referer(), 'comment.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( wp_get_referer() && ! $noredir && ! str_contains( wp_get_referer(), 'comment.php' ) ) {
</ins><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></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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/edit.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( $parent_file );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = add_query_arg( 'paged', $pagenum, $sendback );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $sendback, 'post.php' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $sendback, 'post.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( $post_new_file );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -126,7 +126,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $search = str_replace( $comma, ',', $search );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $search, ',' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $search, ',' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $search = explode( ',', $search );
</span><span class="cx" style="display: block; padding: 0 10px"> $search = $search[ count( $search ) - 1 ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2306,7 +2306,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $val = explode( ',', $val );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $val as $k => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $v, 'widget-' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $v, 'widget-' ) ) {
</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="trunksrcwpadminincludesclassautomaticupgraderskinphp"></a>
<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-automatic-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-automatic-upgrader-skin.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -84,7 +84,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $string = $this->upgrader->strings[ $string ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $string, '%' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $string, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = vsprintf( $string, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclassbulkupgraderskinphp"></a>
<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-bulk-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-bulk-upgrader-skin.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,7 +59,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $feedback = $this->upgrader->strings[ $feedback ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $feedback, '%' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $feedback, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_map( 'strip_tags', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_map( 'esc_html', $args );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasscoreupgraderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-core-upgrader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-core-upgrader.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-core-upgrader.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,9 +181,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * mkdir_failed__copy_dir, copy_failed__copy_dir_retry, and disk_full.
</span><span class="cx" style="display: block; padding: 0 10px"> * do_rollback allows for update_core() to trigger a rollback if needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $error_code, 'do_rollback' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $error_code, 'do_rollback' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $try_rollback = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( false !== strpos( $error_code, '__copy_dir' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $error_code, '__copy_dir' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $try_rollback = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'disk_full' === $error_code ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $try_rollback = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -323,7 +323,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"> // Don't claim we can update on update-core.php if we have a non-critical failure logged.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_version === $failure_data['current'] && false !== strpos( $offered_ver, '.1.next.minor' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_version === $failure_data['current'] && str_contains( $offered_ver, '.1.next.minor' ) ) {
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-custom-image-header.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -369,7 +369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color = get_theme_support( 'custom-header', 'default-text-color' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $default_color && false === strpos( $default_color, '#' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $default_color && ! str_contains( $default_color, '#' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_color = '#' . $default_color;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -768,7 +768,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color = get_theme_support( 'custom-header', 'default-text-color' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $default_color && false === strpos( $default_color, '#' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $default_color && ! str_contains( $default_color, '#' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $default_color = '#' . $default_color;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -776,7 +776,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $header_textcolor && ! str_contains( $header_textcolor, '#' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $header_textcolor = '#' . $header_textcolor;
</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="trunksrcwpadminincludesclassftpphp"></a>
<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-ftp.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-ftp.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-ftp.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $chunks=explode(';',$pattern);
</span><span class="cx" style="display: block; padding: 0 10px"> foreach($chunks as $pattern) {
</span><span class="cx" style="display: block; padding: 0 10px"> $escape=array('$','^','.','{','}','(',')','[',']','|');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while(strpos($pattern,'**')!==false)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while(str_contains($pattern,'**'))
</ins><span class="cx" style="display: block; padding: 0 10px"> $pattern=str_replace('**','*',$pattern);
</span><span class="cx" style="display: block; padding: 0 10px"> foreach($escape as $probe)
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern=str_replace($probe,"\\$probe",$pattern);
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpajaxupgraderskinphp"></a>
<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-ajax-upgrader-skin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-ajax-upgrader-skin.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,7 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $string = $this->upgrader->strings[ $string ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $string, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $string, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $args ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $string = vsprintf( $string, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-automatic-updater.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -582,7 +582,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Send debugging email to admin for all development installations.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->update_results ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $development_version = false !== strpos( get_bloginfo( 'version' ), '-' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $development_version = str_contains( get_bloginfo( 'version' ), '-' );
</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 send a debugging email for each automatic background update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -640,13 +640,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Any of these WP_Error codes are critical failures, as in they occurred after we started to copy core files.
</span><span class="cx" style="display: block; padding: 0 10px"> // We should not try to perform a background update again until there is a successful one-click update performed by the user.
</span><span class="cx" style="display: block; padding: 0 10px"> $critical = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'disk_full' === $error_code || false !== strpos( $error_code, '__copy_dir' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'disk_full' === $error_code || str_contains( $error_code, '__copy_dir' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $critical = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'rollback_was_required' === $error_code && is_wp_error( $result->get_error_data()->rollback ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // A rollback is only critical if it failed too.
</span><span class="cx" style="display: block; padding: 0 10px"> $critical = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $rollback_result = $result->get_error_data()->rollback;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( false !== strpos( $error_code, 'do_rollback' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $error_code, 'do_rollback' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $critical = 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="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,7 +81,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST['s'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $wild = '';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $s, '*' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $s, '*' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wild = '*';
</span><span class="cx" style="display: block; padding: 0 10px"> $s = trim( $s, '*' );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-plugin-install-list-table.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $tabs['search'] = __( 'Search Results' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'beta' === $tab || false !== strpos( get_bloginfo( 'version' ), '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'beta' === $tab || str_contains( get_bloginfo( 'version' ), '-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tabs['beta'] = _x( 'Beta Testing', 'Plugin Installer' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpsitehealthautoupdatesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-site-health-auto-updates.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,7 +332,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $checksums = get_core_checksums( $wp_version, 'en_US' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $dev = ( false !== strpos( $wp_version, '-' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $dev = ( str_contains( $wp_version, '-' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the last stable version's files and test against that.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $checksums && $dev ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $checksums = get_core_checksums( (float) $wp_version - 0.1, 'en_US' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -396,7 +396,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_accepts_dev_updates() {
</span><span class="cx" style="display: block; padding: 0 10px"> require ABSPATH . WPINC . '/version.php'; // $wp_version; // x.y.z
</span><span class="cx" style="display: block; padding: 0 10px"> // Only for dev versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $wp_version, '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $wp_version, '-' ) ) {
</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="trunksrcwpadminincludesclasswpsitehealthphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-site-health.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-site-health.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-site-health.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
</span><span class="cx" style="display: block; padding: 0 10px"> * mysqlnd has supported utf8mb4 since 5.0.9.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $mysql_client_version, 'mysqlnd' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $mysql_client_version, 'mysqlnd' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mysql_client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $mysql_client_version );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( version_compare( $mysql_client_version, '5.0.9', '<' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $result['status'] = 'recommended';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3335,7 +3335,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_page_cache_headers() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $cache_hit_callback = static function ( $header_value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false !== strpos( strtolower( $header_value ), 'hit' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_contains( strtolower( $header_value ), 'hit' );
</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"> $cache_headers = array(
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpupgraderskinphp"></a>
<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-skin.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-skin.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/class-wp-upgrader-skin.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -197,7 +197,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $feedback = $this->upgrader->strings[ $feedback ];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $feedback, '%' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $feedback, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_map( 'strip_tags', $args );
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_map( 'esc_html', $args );
</span></span></pre></div>
<a id="trunksrcwpadminincludescreditsphp"></a>
<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/credits.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/credits.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/credits.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,7 +32,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $results = get_site_transient( 'wordpress_credits_' . $locale );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $results )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || false !== strpos( $version, '-' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || str_contains( $version, '-' )
</ins><span class="cx" style="display: block; padding: 0 10px"> || ( isset( $results['data']['version'] ) && ! str_starts_with( $version, $results['data']['version'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = "http://api.wordpress.org/core/credits/1.1/?version={$version}&locale={$locale}";
</span></span></pre></div>
<a id="trunksrcwpadminincludesdeprecatedphp"></a>
<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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/deprecated.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/deprecated.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1376,7 +1376,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"> // Eliminate some common badly formed plugin descriptions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- while ( ( null !== $item_key = array_rand($items) ) && false !== strpos( $items[$item_key]->get_description(), 'Plugin Name:' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ while ( ( null !== $item_key = array_rand($items) ) && str_contains( $items[$item_key]->get_description(), 'Plugin Name:' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($items[$item_key]);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset($items[$item_key]) )
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/file.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1693,7 +1693,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 ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $dir, $to ) ) { // If the directory is not within the working directory, skip it.
</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">@@ -1834,7 +1834,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 ( strpos( $dir, $to ) === false ) { // If the directory is not within the working directory, skip it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $dir, $to ) ) { // If the directory is not within the working directory, skip it.
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/media.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2183,8 +2183,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> wp_is_mobile() &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
- strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ str_contains( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) &&
+ str_contains( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plupload_init['multi_selection'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3850,7 +3850,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $referer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $referer, 'upload.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $referer, 'upload.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = remove_query_arg( array( 'attached', 'detach' ), $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesmiscphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/misc.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/misc.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/misc.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $state = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $markerdata as $markerline ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $markerline, '# END ' . $marker ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $markerline, '# END ' . $marker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $state = 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">@@ -88,7 +88,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result[] = $markerline;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $markerline, '# BEGIN ' . $marker ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $markerline, '# BEGIN ' . $marker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $state = 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">@@ -194,10 +194,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $found_end_marker = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $lines as $line ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $found_marker && false !== strpos( $line, $start_marker ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $found_marker && str_contains( $line, $start_marker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_marker = true;
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ! $found_end_marker && false !== strpos( $line, $end_marker ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! $found_end_marker && str_contains( $line, $end_marker ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found_end_marker = true;
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/plugin.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -102,7 +102,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If no text domain is defined fall back to the plugin slug.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $plugin_data['TextDomain'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $plugin_slug = dirname( plugin_basename( $plugin_file ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '.' !== $plugin_slug && false === strpos( $plugin_slug, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '.' !== $plugin_slug && ! str_contains( $plugin_slug, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_data['TextDomain'] = $plugin_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">@@ -1935,7 +1935,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent_page;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent_page;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( empty( $typenow ) && $pagenow === $submenu_array[2]
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && ( empty( $parent_file ) || false === strpos( $parent_file, '?' ) )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ( empty( $parent_file ) || ! str_contains( $parent_file, '?' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_file = $parent_page;
</span><span class="cx" style="display: block; padding: 0 10px"> return $parent_page;
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/post.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1125,7 +1125,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url_id = (int) $url_match[2];
</span><span class="cx" style="display: block; padding: 0 10px"> $rel_id = (int) $rel_match[1];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos( $url_match[0], $site_url ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $url_id || ! $rel_id || $url_id != $rel_id || ! str_contains( $url_match[0], $site_url ) ) {
</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">@@ -1515,7 +1515,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"> // Permalinks without a post/page name placeholder don't have anything to edit.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $permalink, '%postname%' ) && ! str_contains( $permalink, '%pagename%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $view_link ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1755,7 +1755,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"> $sendback = wp_get_referer();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $locked && $sendback && false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $locked && $sendback && ! str_contains( $sendback, 'post.php' ) && ! str_contains( $sendback, 'post-new.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback_text = __( 'Go back' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesprivacytoolsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/privacy-tools.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/privacy-tools.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/privacy-tools.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -275,7 +275,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $group_item_data as $group_item_datum ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $group_item_datum['value'];
</span><span class="cx" style="display: block; padding: 0 10px"> // If it looks like a link, make it a link.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $value, ' ' ) && ( str_starts_with( $value, 'http://' ) || str_starts_with( $value, 'https://' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $value, ' ' ) && ( str_starts_with( $value, 'http://' ) || str_starts_with( $value, 'https://' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $value = '<a href="' . esc_url( $value ) . '">' . esc_html( $value ) . '</a>';
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1240,7 +1240,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> try {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $callback ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection = new ReflectionMethod( $callback[0], $callback[1] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_string( $callback ) && false !== strpos( $callback, '::' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_string( $callback ) && str_contains( $callback, '::' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $reflection = new ReflectionMethod( $callback );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $reflection = new ReflectionFunction( $callback );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/update-core.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1140,7 +1140,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $php_version = PHP_VERSION;
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql_version = $wpdb->db_version();
</span><span class="cx" style="display: block; padding: 0 10px"> $old_wp_version = $GLOBALS['wp_version']; // The version of WordPress we're updating from.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $development_build = ( false !== strpos( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $development_build = ( str_contains( $old_wp_version . $wp_version, '-' ) ); // A dash in the version indicates a development release.
</ins><span class="cx" style="display: block; padding: 0 10px"> $php_compat = version_compare( $php_version, $required_php_version, '>=' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1764,7 +1764,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $files = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( "{$directory}example.html" )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && false !== strpos( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && str_contains( file_get_contents( "{$directory}example.html" ), '<title>Genericons</title>' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $files[] = "{$directory}example.html";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1774,7 +1774,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $dirs,
</span><span class="cx" style="display: block; padding: 0 10px"> static function( $dir ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Skip any node_modules directories.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false === strpos( $dir, 'node_modules' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return ! str_contains( $dir, 'node_modules' );
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/upgrade.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1842,7 +1842,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 21811 && wp_should_upgrade_global_tables() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $meta_keys = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array_merge( get_post_types(), get_taxonomies() ) as $name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $name, '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $name, '-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $meta_keys[] = 'edit_' . str_replace( '-', '_', $name ) . '_per_page';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3247,7 +3247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check to make sure it's not a new index.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'index.php' === $oldfile ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $index = implode( '', file( "$oldpath/$oldfile" ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $index, 'WP_USE_THEMES' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $index, 'WP_USE_THEMES' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! copy( "$default_dir/$oldfile", "$site_dir/$newfile" ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3364,7 +3364,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $stylelines as $line ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $headers as $header => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $line, $header ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $line, $header ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $line = $header . ' ' . $value;
</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="trunksrcwpadminincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/user.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/includes/user.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -174,7 +174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for "\" in password.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( wp_unslash( $pass1 ), '\\' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( wp_unslash( $pass1 ), '\\' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'pass', __( '<strong>Error:</strong> Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
</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="trunksrcwpadminmenuheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/menu-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/menu-header.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/menu-header.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $img_style = '';
</span><span class="cx" style="display: block; padding: 0 10px"> $img_class = ' dashicons-before';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $class, 'wp-menu-separator' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_separator = 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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/network/site-settings.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $option->option_value, "\n" ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $option->option_value, "\n" ) ) {
</ins><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 ); ?>" class="code"><?php echo esc_html( $option->option_name ); ?></label></th>
</span></span></pre></div>
<a id="trunksrcwpadminnetworkthemesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/themes.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/network/themes.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,7 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> case 'enable':
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'enable-theme_' . $_GET['theme'] );
</span><span class="cx" style="display: block; padding: 0 10px"> WP_Theme::network_enable_theme( $_GET['theme'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $referer, '/network/themes.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $referer, '/network/themes.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( network_admin_url( 'themes.php?enabled=1' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_safe_redirect( add_query_arg( 'enabled', 1, $referer ) );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/options-general.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -236,7 +236,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $check_zone_info = true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove old Etc mappings. Fallback to gmt_offset.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( false !== strpos( $tzstring, 'Etc/GMT' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( str_contains( $tzstring, 'Etc/GMT' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tzstring = '';
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/options.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="<?php echo $name; ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
</span><span class="cx" style="display: block; padding: 0 10px"> <td>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( strpos( $value, "\n" ) !== false ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( str_contains( $value, "\n" ) ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <textarea class="<?php echo $class; ?>" name="<?php echo $name; ?>" id="<?php echo $name; ?>" cols="30" rows="5"><?php echo esc_textarea( $value ); ?></textarea>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input class="regular-text <?php echo $class; ?>" type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr( $value ); ?>"<?php disabled( $disabled, true ); ?> />
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/post.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,8 +55,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $sendback ||
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- false !== strpos( $sendback, 'post.php' ) ||
- false !== strpos( $sendback, 'post-new.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ str_contains( $sendback, 'post.php' ) ||
+ str_contains( $sendback, 'post-new.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' === $post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sendback = admin_url( 'upload.php' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -97,7 +97,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['ping_status'] = get_default_comment_status( $post->post_type, 'pingback' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Wrap Quick Draft content in the Paragraph block.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $_POST['content'], '<!-- wp:paragraph -->' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $_POST['content'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> '<!-- wp:paragraph -->%s<!-- /wp:paragraph -->',
</span><span class="cx" style="display: block; padding: 0 10px"> str_replace( array( "\r\n", "\r", "\n" ), '<br />', $_POST['content'] )
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/upload.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $location = 'upload.php';
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = wp_get_referer();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $referer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $referer, 'upload.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $referer, 'upload.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/user-edit.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p><strong><?php _e( 'User updated.' ); ?></strong></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $wp_http_referer && ! str_contains( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <p><a href="<?php echo esc_url( wp_validate_redirect( sanitize_url( $wp_http_referer ), self_admin_url( 'users.php' ) ) ); ?>"><?php _e( '← Go to Users' ); ?></a></p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre></div>
<a id="trunksrcwpadminusernewphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/user-new.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/user-new.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/user-new.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,7 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_details = null;
</span><span class="cx" style="display: block; padding: 0 10px"> $user_email = wp_unslash( $_REQUEST['email'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $user_email, '@' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $user_email, '@' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $user_details = get_user_by( 'email', $user_email );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'manage_network_users' ) ) {
</span></span></pre></div>
<a id="trunksrcwpadminwidgetsformphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/widgets-form.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/widgets-form.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-admin/widgets-form.php 2023-06-22 14:34:56 UTC (rev 55988)
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_sidebars = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' === substr( $sidebar, 0, 16 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wrap_class = 'widgets-holder-wrap';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $registered_sidebar['class'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wrap_class .= ' ' . $registered_sidebar['class'];
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninciconfunctionsphp"></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/twentyseventeen/inc/icon-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/icon-functions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -130,7 +130,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Change SVG icon inside social links menu if there is supported URL.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'social' === $args->theme_location ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $social_icons as $attr => $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $item_output, $attr ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $item_output, $attr ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $item_output = str_replace( $args->link_after, '</span>' . twentyseventeen_get_svg( array( 'icon' => esc_attr( $value ) ) ), $item_output );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentaudiophp"></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/twentyseventeen/template-parts/post/content-audio.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-audio.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $audio = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only get audio from the content if a playlist isn't present.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, 'wp-playlist-script' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $audio = get_media_embedded_in_content( $content, array( 'audio' ) );
</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="trunksrcwpcontentthemestwentyseventeentemplatepartspostcontentvideophp"></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/twentyseventeen/template-parts/post/content-video.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/post/content-video.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $video = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Only get video from the content if a playlist isn't present.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, 'wp-playlist-script' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, 'wp-playlist-script' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $video = get_media_embedded_in_content( $content, array( 'video', 'object', 'embed', 'iframe' ) );
</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="trunksrcwpcontentthemestwentytwentycommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/comments.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentytwenty/comments.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -80,7 +80,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $pagination_classes = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're only showing the "Next" link, add a class indicating so.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $comment_pagination, 'prev page-numbers' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $comment_pagination, 'prev page-numbers' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $pagination_classes = ' only-next';
</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="trunksrcwpcontentthemestwentytwentyfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/functions.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentytwenty/functions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -316,7 +316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $html, ' style=' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $html, ' style=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $search[] = '/(src=)/';
</span><span class="cx" style="display: block; padding: 0 10px"> $replace[] = "style=\"height: {$logo_height}px;\" src=";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentytemplatepartspaginationphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentytwenty/template-parts/pagination.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,12 +37,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"> // If we're not outputting the previous page link, prepend a placeholder with `visibility: hidden` to take its place.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( strpos( $posts_pagination, 'prev page-numbers' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! str_contains( $posts_pagination, 'prev page-numbers' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_pagination = str_replace( '<div class="nav-links">', '<div class="nav-links"><span class="prev page-numbers placeholder" aria-hidden="true">' . $prev_text . '</span>', $posts_pagination );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we're not outputting the next page link, append a placeholder with `visibility: hidden` to take its place.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( strpos( $posts_pagination, 'next page-numbers' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! str_contains( $posts_pagination, 'next page-numbers' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $posts_pagination = str_replace( '</div>', '<span class="next page-numbers placeholder" aria-hidden="true">' . $next_text . '</span></div>', $posts_pagination );
</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="trunksrcwpcontentthemestwentytwentyoneinctemplatefunctionsphp"></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/twentytwentyone/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/twentytwentyone/inc/template-functions.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-content/themes/twentytwentyone/inc/template-functions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -445,7 +445,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $attr;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $attr['class'] ) && false !== strpos( $attr['class'], 'custom-logo' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $attr['class'] ) && str_contains( $attr['class'], 'custom-logo' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $attr;
</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="trunksrcwpincludesblocksupportsduotonephp"></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/block-supports/duotone.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/duotone.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/block-supports/duotone.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> * @return float Value in the range [0, 1].
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_tinycolor_bound01( $n, $max ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'string' === gettype( $n ) && false !== strpos( $n, '.' ) && 1 === (float) $n ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'string' === gettype( $n ) && str_contains( $n, '.' ) && 1 === (float) $n ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = '100%';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -55,7 +55,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $n = min( $max, max( 0, (float) $n ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Automatically convert percentage into number.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'string' === gettype( $n ) && false !== strpos( $n, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'string' === gettype( $n ) && str_contains( $n, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $n = (int) ( $n * $max ) / 100;
</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="trunksrcwpincludesblocktemplatephp"></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/block-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-template.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/block-template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -166,7 +166,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Is the active theme a child theme, and is the PHP fallback template part of it?
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> str_starts_with( $fallback_template, $theme_base_path ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $fallback_template, $parent_theme_base_path ) === false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! str_contains( $fallback_template, $parent_theme_base_path )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fallback_template_slug = substr(
</span><span class="cx" style="display: block; padding: 0 10px"> $fallback_template,
</span></span></pre></div>
<a id="trunksrcwpincludesblocksphp"></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/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/blocks.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $post = $wp_post->post_content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false !== strpos( (string) $post, '<!-- wp:' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_contains( (string) $post, '<!-- wp:' );
</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">@@ -619,12 +619,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * This matches behavior for WordPress 5.0.0 - 5.3.0 in matching blocks by
</span><span class="cx" style="display: block; padding: 0 10px"> * their serialized 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 ( false === strpos( $block_name, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $block_name, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $block_name = 'core/' . $block_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"> // Test for existence of block by its fully qualified name.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_block = false !== strpos( $post, '<!-- wp:' . $block_name . ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_block = str_contains( $post, '<!-- wp:' . $block_name . ' ' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $has_block ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -633,7 +633,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $serialized_block_name = strip_core_block_namespace( $block_name );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $serialized_block_name !== $block_name ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_block = false !== strpos( $post, '<!-- wp:' . $serialized_block_name . ' ' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_block = str_contains( $post, '<!-- wp:' . $serialized_block_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">
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/canonical.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -389,7 +389,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_single() && strpos( $wp_rewrite->permalink_structure, '%category%' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_single() && str_contains( $wp_rewrite->permalink_structure, '%category%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $category_name = get_query_var( 'category_name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $category_name ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -518,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $addl_path )
</span><span class="cx" style="display: block; padding: 0 10px"> && $wp_rewrite->using_index_permalinks()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && strpos( $redirect['path'], '/' . $wp_rewrite->index . '/' ) === false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ! str_contains( $redirect['path'], '/' . $wp_rewrite->index . '/' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['path'] = trailingslashit( $redirect['path'] ) . $wp_rewrite->index . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,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"> // Hex-encoded octets are case-insensitive.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $requested_url, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $requested_url, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! function_exists( 'lowercase_octets' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Converts the first hex-encoded octet match to lowercase.
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -677,7 +677,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If no date-related order is available, use the date from the first available clause.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $comment_id_order ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $orderby_array as $orderby_clause ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( 'ASC', $orderby_clause ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( 'ASC', $orderby_clause ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_id_order = 'ASC';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_id_order = 'DESC';
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3610,7 +3610,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $changeset_post_id, array( 'check_enabled' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $revision->post_name, "{$changeset_post_id}-autosave" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $revision->post_name, "{$changeset_post_id}-autosave" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->posts,
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-date-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -494,7 +494,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"> // Attempt to detect a table prefix.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $column, '.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $column, '.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the list of valid date query columns.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpeditorphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-editor.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-editor.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-editor.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$this_tinymce = ( $set['tinymce'] && user_can_richedit() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( self::$this_tinymce ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $editor_id, '[' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $editor_id, '[' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> self::$this_tinymce = false;
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument( 'wp_editor()', '3.9.0', 'TinyMCE editor IDs cannot have brackets.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1484,7 +1484,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 ( false !== strpos( $value, '&' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $value, '&' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mce_translation[ $key ] = html_entity_decode( $value, ENT_QUOTES, 'UTF-8' );
</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="trunksrcwpincludesclasswphttpproxyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-proxy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-proxy.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-http-proxy.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,7 +209,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $bypass_hosts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bypass_hosts = preg_split( '|,\s*|', WP_PROXY_BYPASS_HOSTS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( WP_PROXY_BYPASS_HOSTS, '*' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( WP_PROXY_BYPASS_HOSTS, '*' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wildcard_regex = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $bypass_hosts as $host ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpphp"></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.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-http.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -721,7 +721,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * In this case, determine the final HTTP header and parse from there.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = count( $headers ) - 1; $i >= 0; $i-- ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $headers[ $i ] ) && false === strpos( $headers[ $i ], ':' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $headers[ $i ] ) && ! str_contains( $headers[ $i ], ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $headers = array_splice( $headers, $i );
</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">@@ -734,7 +734,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 ( false === strpos( $tempheader, ':' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $tempheader, ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $stack = explode( ' ', $tempheader, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> $stack[] = '';
</span><span class="cx" style="display: block; padding: 0 10px"> list( , $response['code'], $response['message']) = $stack;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -905,7 +905,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $accessible_hosts ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $accessible_hosts = preg_split( '|,\s*|', WP_ACCESSIBLE_HOSTS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( WP_ACCESSIBLE_HOSTS, '*' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( WP_ACCESSIBLE_HOSTS, '*' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wildcard_regex = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $accessible_hosts as $host ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1096,7 +1096,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return 4;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 6;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpmetaqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-meta-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-meta-query.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-meta-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -374,7 +374,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If any JOINs are LEFT JOINs (as in the case of NOT EXISTS), then all JOINs should
</span><span class="cx" style="display: block; padding: 0 10px"> * be LEFT. Otherwise posts with no metadata will be excluded from results.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $sql['join'], 'LEFT JOIN' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $sql['join'], 'LEFT JOIN' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sql['join'] = str_replace( 'INNER JOIN', 'LEFT JOIN', $sql['join'] );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-oembed.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,7 +754,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string Possibly modified $html
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function _strip_newlines( $html, $data, $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $html, "\n" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $html, "\n" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $html;
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-post-type.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> remove_rewrite_tag( "%$this->name%" );
</span><span class="cx" style="display: block; padding: 0 10px"> remove_permastruct( $this->name );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $wp_rewrite->extra_rules_top as $regex => $query ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $query, "index.php?post_type=$this->name" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $query, "index.php?post_type=$this->name" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $wp_rewrite->extra_rules_top[ $regex ] );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1015,7 +1015,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_admin = 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 ( false !== strpos( $qv['feed'], 'comments-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $qv['feed'], 'comments-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $qv['feed'] = str_replace( 'comments-', '', $qv['feed'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['withcomments'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1185,7 +1185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term = implode( ',', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $term, '+' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $term, '+' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $terms = preg_split( '/[+]+/', $term );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $terms as $term ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tax_query[] = array_merge(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1298,7 +1298,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Tag stuff.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $q['tag'] && ! $this->is_singular && $this->query_vars_changed ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $q['tag'], ',' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $q['tag'], ',' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $tags = preg_split( '/[,\r\n\t ]+/', $q['tag'] );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tags as $tag ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tag = sanitize_term_field( 'slug', $tag, 0, 'post_tag', 'db' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2354,7 +2354,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Author stuff for nice URLs.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $q['author_name'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $q['author_name'], '/' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $q['author_name'], '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $q['author_name'] = explode( '/', $q['author_name'] );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $q['author_name'][ count( $q['author_name'] ) - 1 ] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['author_name'] = $q['author_name'][ count( $q['author_name'] ) - 1 ]; // No trailing slash.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4754,7 +4754,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"> $content = $post->post_content;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $content, '<!--nextpage-->' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-rewrite.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -509,7 +509,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $date_endian = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $endians as $endian ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $this->permalink_structure, $endian ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $this->permalink_structure, $endian ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $date_endian = $endian;
</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">@@ -1660,7 +1660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $external = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $query = add_query_arg( $query, 'index.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">- $index = false === strpos( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index = ! str_contains( $query, '?' ) ? strlen( $query ) : strpos( $query, '?' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $front = substr( $query, 0, $index );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $external = $front != $this->index;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpsitequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-site-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site-query.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-site-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -753,7 +753,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function get_search_sql( $search, $columns ) {
</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 ( false !== strpos( $search, '*' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $search, '*' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $like = '%' . implode( '%', array_map( array( $wpdb, 'esc_like' ), explode( '*', $search ) ) ) . '%';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $like = '%' . $wpdb->esc_like( $search ) . '%';
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-user-query.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -713,7 +713,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename', 'display_name' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $search_columns ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $search, '@' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $search, '@' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $search_columns = array( 'user_email' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_numeric( $search ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $search_columns = array( 'user_login', 'ID' );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5691,7 +5691,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachments = $wpdb->get_results( "SELECT ID, guid FROM {$wpdb->posts} WHERE post_parent = '0' AND post_type = 'attachment'" );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $attachments ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attachments as $file ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! empty( $file->guid ) && strpos( $post_content, $file->guid ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $file->guid ) && str_contains( $post_content, $file->guid ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->update( $wpdb->posts, array( 'post_parent' => $post_id ), array( 'ID' => $file->ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wp.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -274,10 +274,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"> // If req_uri is empty or if it is a request for ourself, unset error.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $requested_path ) || $requested_file == $self || strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $requested_path ) || $requested_file == $self || str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $error, $_GET['error'] );
</span><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( $perma_query_vars ) && strpos( $_SERVER['PHP_SELF'], 'wp-admin/' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $perma_query_vars ) && str_contains( $_SERVER['PHP_SELF'], 'wp-admin/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $perma_query_vars );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -455,7 +455,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // We're showing a feed, so WP is indeed the only thing that last changed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $this->query_vars['withcomments'] )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- || false !== strpos( $this->query_vars['feed'], 'comments-' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ || str_contains( $this->query_vars['feed'], 'comments-' )
</ins><span class="cx" style="display: block; padding: 0 10px"> || ( empty( $this->query_vars['withoutcomments'] )
</span><span class="cx" style="display: block; padding: 0 10px"> && ( ! empty( $this->query_vars['p'] )
</span><span class="cx" style="display: block; padding: 0 10px"> || ! empty( $this->query_vars['name'] )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -720,7 +720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check for paged content that exceeds the max number of pages.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post && ! empty( $this->query_vars['page'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if content is actually intended to be paged.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $post->post_content, $next ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $post->post_content, $next ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $page = trim( $this->query_vars['page'], '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $content_found = (int) $page <= ( substr_count( $post->post_content, $next ) + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdbphp"></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-wpdb.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wpdb.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/class-wpdb.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1497,7 +1497,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // This is not meant to be foolproof -- but it will catch obviously incorrect usage.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $query, '%' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $query, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_load_translations_early();
</span><span class="cx" style="display: block; padding: 0 10px"> _doing_it_wrong(
</span><span class="cx" style="display: block; padding: 0 10px"> 'wpdb::prepare',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4068,7 +4068,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
</span><span class="cx" style="display: block; padding: 0 10px"> * mysqlnd has supported utf8mb4 since 5.0.9.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $client_version, 'mysqlnd' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
</span><span class="cx" style="display: block; padding: 0 10px"> return version_compare( $client_version, '5.0.9', '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/comment-template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -970,13 +970,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = trim( strip_tags( $text ), '% ' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace '% Comments' with a proper plural form.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $text && ! preg_match( '/[0-9]+/', $text ) && false !== strpos( $more, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $text && ! preg_match( '/[0-9]+/', $text ) && str_contains( $more, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Number of comments. */
</span><span class="cx" style="display: block; padding: 0 10px"> $new_text = _n( '%s Comment', '%s Comments', $comments_number );
</span><span class="cx" style="display: block; padding: 0 10px"> $new_text = trim( sprintf( $new_text, '' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $more = str_replace( $text, $new_text, $more );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $more, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $more, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $more = '% ' . $more;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2651,7 +2651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args = array_merge( $defaults, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove `aria-describedby` from the email field if there's no associated description.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( $args['fields']['email'] ) && false === strpos( $args['comment_notes_before'], 'id="email-notes"' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['fields']['email'] ) && ! str_contains( $args['comment_notes_before'], 'id="email-notes"' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['fields']['email'] = str_replace(
</span><span class="cx" style="display: block; padding: 0 10px"> ' aria-describedby="email-notes"',
</span><span class="cx" style="display: block; padding: 0 10px"> '',
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/comment.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 1 == $ok_to_comment ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ( empty( $mod_keys ) || false === strpos( $email, $mod_keys ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ( empty( $mod_keys ) || ! str_contains( $email, $mod_keys ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span></span></pre></div>
<a id="trunksrcwpincludescronphp"></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/cron.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/cron.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/cron.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -974,7 +974,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _wp_cron() {
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent infinite loops caused by lack of wp-cron.php.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) !== false || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $_SERVER['REQUEST_URI'], '/wp-cron.php' ) || ( defined( 'DISABLE_WP_CRON' ) && DISABLE_WP_CRON ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 0;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/deprecated.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -889,7 +889,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_links($args = '') {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '2.1.0', 'wp_list_bookmarks()' );
</span><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( $args, '=' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $args, '=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $cat_id = $args;
</span><span class="cx" style="display: block; padding: 0 10px"> $args = add_query_arg( 'category', $cat_id, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -995,7 +995,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= '<a href="' . $the_link . '"' . $rel . $title . $target. '>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $row->link_image != null && $show_images ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos($row->link_image, 'http') !== false )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $row->link_image, 'http' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "<img src=\"$row->link_image\" $alt $title />";
</span><span class="cx" style="display: block; padding: 0 10px"> else // If it's a relative path.
</span><span class="cx" style="display: block; padding: 0 10px"> $output .= "<img src=\"" . get_option('siteurl') . "$row->link_image\" $alt $title />";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4484,7 +4484,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we don't have a preset CSS variable, we'll assume it's a regular CSS value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $style_value, "var:preset|{$css_property}|" ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $style_value, "var:preset|{$css_property}|" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return sprintf( '%s:%s;', $css_property, $style_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="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/feed.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -448,7 +448,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function html_type_rss() {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = get_bloginfo( 'html_type' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $type, 'xhtml' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $type, 'xhtml' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $type = 'xhtml';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'html';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +580,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array array(type, value)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function prep_atom_text_construct( $data ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $data, '<' ) === false && strpos( $data, '&' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $data, '<' ) && ! str_contains( $data, '&' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'text', $data );
</span><span class="cx" style="display: block; padding: 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 +597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $parser );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $code ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $data, '<' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $data, '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'text', $data );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = "<div xmlns='http://www.w3.org/1999/xhtml'>$data</div>";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -605,7 +605,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 ( strpos( $data, ']]>' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $data, ']]>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return array( 'html', "<![CDATA[$data]]>" );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return array( 'html', htmlspecialchars( $data ) );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/formatting.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -272,18 +272,18 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = str_replace( $static_characters, $static_replacements, $curl );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $curl, "'" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $curl, "'" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = str_replace( $apos_flag, $apos, $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $curl, '"' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $curl, '"' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
</span><span class="cx" style="display: block; padding: 0 10px"> $curl = str_replace( $open_q_flag, $opening_quote, $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $curl, '-' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $curl, '-' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -326,7 +326,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sentences = explode( $open_quote, $haystack );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sentences as $key => &$sentence ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $sentence, $needle ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $sentence, $needle ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -362,7 +362,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $prime_pattern, $prime, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> $sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '"' === $needle && false !== strpos( $sentence, '"' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '"' === $needle && str_contains( $sentence, '"' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $sentence = str_replace( '"', $close_quote, $sentence );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -453,7 +453,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Pre tags shouldn't be touched by autop.
</span><span class="cx" style="display: block; padding: 0 10px"> * Replace pre tags with placeholders and bring them back after autop.
</span><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( $text, '<pre' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '<pre' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text_parts = explode( '</pre>', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_part = array_pop( $text_parts );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -498,7 +498,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = wp_replace_in_html_tags( $text, array( "\n" => ' <!-- wpnl --> ' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Collapse line breaks before and after <option> elements so they don't get autop'd.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $text, '<option' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '<option' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|\s*<option|', '<option', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|</option>\s*|', '</option>', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,7 +507,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Collapse line breaks inside <object> elements, before <param> and <embed> elements
</span><span class="cx" style="display: block; padding: 0 10px"> * so they don't get autop'd.
</span><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( $text, '</object>' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '</object>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|(<object[^>]*>)\s*|', '$1', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|\s*</object>|', '</object>', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $text );
</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"> * Collapse line breaks inside <audio> and <video> elements,
</span><span class="cx" style="display: block; padding: 0 10px"> * before and after <source> and <track> elements.
</span><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( $text, '<source' ) !== false || strpos( $text, '<track' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '<source' ) || str_contains( $text, '<track' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $text );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -524,7 +524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Collapse line breaks before and after <figcaption> elements.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $text, '<figcaption' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '<figcaption' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|\s*(<figcaption[^>]*>)|', '$1', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> $text = preg_replace( '|</figcaption>\s*|', '</figcaption>', $text );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -593,7 +593,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"> // Restore newlines in all elements.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $text, '<!-- wpnl -->' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, '<!-- wpnl -->' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $text = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $text );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -763,7 +763,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through delimiters (elements) only.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $textarr[ $i ], $needle ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $textarr[ $i ], $needle ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $textarr[ $i ] = str_replace( $needle, $replace, $textarr[ $i ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $changed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -775,7 +775,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Loop through delimiters (elements) only.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $needles as $needle ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $textarr[ $i ], $needle ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $textarr[ $i ], $needle ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $textarr[ $i ] = strtr( $textarr[ $i ], $replace_pairs );
</span><span class="cx" style="display: block; padding: 0 10px"> $changed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> // After one strtr() break out of the foreach loop and look at next element.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2055,7 +2055,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = trim( $filename, '.-_' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $filename, '.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $filename, '.' ) ) {
</ins><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"> $filetype = wp_check_filetype( 'test.' . $filename, $mime_types );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $filetype['ext'] === $filename ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4475,7 +4475,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( "'", ''', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( str_contains( $url, '[' ) ) || ( str_contains( $url, ']' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed = wp_parse_url( $url );
</span><span class="cx" style="display: block; padding: 0 10px"> $front = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5143,7 +5143,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The text returned after esc_html if needed.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_pre_kses_less_than_callback( $matches ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $matches[0], '>' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $matches[0], '>' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return esc_html( $matches[0] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $matches[0];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5932,7 +5932,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $emoji as $emojum ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $emoji_char = html_entity_decode( $emojum );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $content, $emoji_char ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $content, $emoji_char ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = preg_replace( "/$emoji_char/", $emojum, $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">@@ -5949,7 +5949,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string The encoded content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_staticize_emoji( $text ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $text, '&#x' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $text, '&#x' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ( function_exists( 'mb_check_encoding' ) && mb_check_encoding( $text, 'ASCII' ) ) || ! preg_match( '/[^\x00-\x7F]/', $text ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The text doesn't contain anything that might be emoji, so we can return early.
</span><span class="cx" style="display: block; padding: 0 10px"> return $text;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5968,7 +5968,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Quickly narrow down the list of emoji that might be in the text and need replacing.
</span><span class="cx" style="display: block; padding: 0 10px"> $possible_emoji = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $emoji as $emojum ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $text, $emojum ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $text, $emojum ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $possible_emoji[ $emojum ] = html_entity_decode( $emojum );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6006,9 +6006,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If it's not a tag and not in ignore block.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] && false !== strpos( $content, '&#x' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' === $ignore_block_element && strlen( $content ) > 0 && '<' !== $content[0] && str_contains( $content, '&#x' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $possible_emoji as $emojum => $emoji_char ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, $emojum ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, $emojum ) ) {
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/functions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +708,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '"' !== substr( $data, -2, 1 ) ) {
</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">- } elseif ( false === strpos( $data, '"' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ! str_contains( $data, '"' ) ) {
</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"> // Or else fall through.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1158,10 +1158,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $protocol = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><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( $uri, '?' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $uri, '?' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $base, $query ) = explode( '?', $uri, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $base .= '?';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( $protocol || strpos( $uri, '=' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $protocol || ! str_contains( $uri, '=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $base = $uri . '?';
</span><span class="cx" style="display: block; padding: 0 10px"> $query = '';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2054,7 +2054,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Do not allow path traversals.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $target, '../' ) || false !== strpos( $target, '..' . DIRECTORY_SEPARATOR ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $target, '../' ) || str_contains( $target, '..' . DIRECTORY_SEPARATOR ) ) {
</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">@@ -2641,7 +2641,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $count = 10000;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The (resized) image files would have name and extension, and will be in the uploads dir.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $name && $ext && @is_dir( $dir ) && false !== strpos( $dir, $upload_dir['basedir'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $name && $ext && @is_dir( $dir ) && str_contains( $dir, $upload_dir['basedir'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the file list used for calculating a unique filename for a newly added file.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4656,7 +4656,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mce_init['directionality'] = 'rtl';
</span><span class="cx" style="display: block; padding: 0 10px"> $mce_init['rtl_ui'] = 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( $mce_init['plugins'] ) && strpos( $mce_init['plugins'], 'directionality' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $mce_init['plugins'] ) && ! str_contains( $mce_init['plugins'], 'directionality' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mce_init['plugins'] .= ',directionality';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5968,13 +5968,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $loaded_mods )
</span><span class="cx" style="display: block; padding: 0 10px"> && function_exists( 'phpinfo' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ && ! str_contains( ini_get( 'disable_functions' ), 'phpinfo' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ob_start();
</span><span class="cx" style="display: block; padding: 0 10px"> phpinfo( INFO_MODULES );
</span><span class="cx" style="display: block; padding: 0 10px"> $phpinfo = ob_get_clean();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $phpinfo, $mod ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $phpinfo, $mod ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6049,7 +6049,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"> // `../` which does not occur at the end of the path is not allowed:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $file, '../' ) && '../' !== mb_substr( $file, -3, 3 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $file, '../' ) && '../' !== mb_substr( $file, -3, 3 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return 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">@@ -6104,7 +6104,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The request is for the admin.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || str_contains( $_SERVER['REQUEST_URI'], 'wp-login.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/(wp-admin/?.*|wp-login\.php.*)#i', '', $_SERVER['REQUEST_URI'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The request is for a file in ABSPATH.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6113,12 +6113,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Request is hitting a file inside ABSPATH.
</span><span class="cx" style="display: block; padding: 0 10px"> $directory = str_replace( ABSPATH, '', $script_filename_dir );
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip off the subdirectory, and any file/query params.
</span><span class="cx" style="display: block; padding: 0 10px"> $path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '', $_SERVER['REQUEST_URI'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $abspath_fix, $script_filename_dir ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Request is hitting a file above ABSPATH.
</span><span class="cx" style="display: block; padding: 0 10px"> $subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip off any file/query params from the path, appending the subdirectory to the installation.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7104,9 +7104,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $ua = $_SERVER['HTTP_USER_AGENT'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $ua, 'iPhone' ) !== false
- || strpos( $ua, 'iPad' ) !== false
- || strpos( $ua, 'iPod' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $ua, 'iPhone' )
+ || str_contains( $ua, 'iPad' )
+ || str_contains( $ua, 'iPod' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8510,8 +8510,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $path, '/' ) === false &&
- strpos( $path, '\\' ) === false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! str_contains( $path, '/' ) &&
+ ! str_contains( $path, '\\' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> unset( $directory_cache[ $path ] );
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( 'dirsize_cache', $directory_cache );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/general-template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4021,7 +4021,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'application/x-patch' === $type || 'text/x-patch' === $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $type = 'text/x-diff';
</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 ( isset( $args['file'] ) && false !== strpos( basename( $args['file'] ), '.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $args['file'] ) && str_contains( basename( $args['file'] ), '.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $extension = strtolower( pathinfo( $args['file'], PATHINFO_EXTENSION ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( wp_get_mime_types() as $exts => $mime ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4157,7 +4157,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'matchBrackets' => 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">- } elseif ( false !== strpos( $type, 'json' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $type, 'json' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'],
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4174,7 +4174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror']['mode']['json'] = 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">- } elseif ( false !== strpos( $type, 'jsx' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $type, 'jsx' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'],
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4220,7 +4220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'matchBrackets' => 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">- } elseif ( false !== strpos( $type, 'xml' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $type, 'xml' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'] = array_merge(
</span><span class="cx" style="display: block; padding: 0 10px"> $settings['codemirror'],
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span></span></pre></div>
<a id="trunksrcwpincludesglobalstylesandsettingsphp"></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/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/global-styles-and-settings.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/global-styles-and-settings.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> array_filter(
</span><span class="cx" style="display: block; padding: 0 10px"> $metadata['path'],
</span><span class="cx" style="display: block; padding: 0 10px"> function ( $item ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $item, 'core/' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $item, 'core/' ) ) {
</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></pre></div>
<a id="trunksrcwpincludeshttpsdetectionphp"></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/https-detection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/https-detection.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/https-detection.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 1. Check if HTML includes the site's Really Simple Discovery link.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_action( 'wp_head', 'rsd_link' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( site_url( 'xmlrpc.php?rsd', 'rpc' ) ) ); // See rsd_link().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false !== strpos( $html, $pattern );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_contains( $html, $pattern );
</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"> // 2. Check if HTML includes the site's REST API link.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -212,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_action( 'wp_head', 'rest_output_link_wp_head' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Try both HTTPS and HTTP since the URL depends on context.
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( get_rest_url() ) ); // See rest_output_link_wp_head().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false !== strpos( $html, $pattern );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return str_contains( $html, $pattern );
</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"> // Otherwise the result cannot be determined.
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/kses.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2499,7 +2499,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $gradient_attr = false;
</span><span class="cx" style="display: block; padding: 0 10px"> $is_custom_var = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $css_item, ':' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $css_item, ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $found = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = explode( ':', $css_item, 2 );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/link-template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -496,7 +496,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parentlink = get_permalink( $post->post_parent );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_numeric( $post->post_name ) || false !== strpos( get_option( 'permalink_structure' ), '%category%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_numeric( $post->post_name ) || str_contains( get_option( 'permalink_structure' ), '%category%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $name = $post->post_name;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -692,7 +692,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = $wp_rewrite->get_feed_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $permalink ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $feed, 'comments_' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $feed, 'comments_' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed = str_replace( 'comments_', '', $feed );
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = $wp_rewrite->get_comment_feed_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -709,7 +709,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $feed = get_default_feed();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $feed, 'comments_' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $feed, 'comments_' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $feed = str_replace( 'comments_', 'comments-', $feed );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1820,7 +1820,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Back-compat, $excluded_terms used to be $excluded_categories with IDs separated by " and ".
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $excluded_terms, ' and ' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $excluded_terms, ' and ' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> _deprecated_argument(
</span><span class="cx" style="display: block; padding: 0 10px"> __FUNCTION__,
</span><span class="cx" style="display: block; padding: 0 10px"> '3.3.0',
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/media.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1168,7 +1168,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 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 ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $dirname, 'wp-content/uploads' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the directory name relative to the upload directory (back compat for pre-2.7 uploads).
</span><span class="cx" style="display: block; padding: 0 10px"> $dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
</span><span class="cx" style="display: block; padding: 0 10px"> $dirname = ltrim( $dirname, '/' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1373,7 +1373,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 file name is part of the `src`, we've confirmed a match.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $src_matched && str_contains( $image_src, $dirname . $image['file'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $src_matched = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $is_src = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1625,7 +1625,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Is it a full size image?
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> isset( $image_meta['file'] ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( $image_src, wp_basename( $image_meta['file'] ) ) !== false
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ str_contains( $image_src, wp_basename( $image_meta['file'] ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $dimensions = array(
</span><span class="cx" style="display: block; padding: 0 10px"> (int) $image_meta['width'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1693,7 +1693,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Bail early if an image has been inserted and later edited.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! str_contains( wp_basename( $image_src ), $img_edit_hash[0] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $image;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1848,17 +1848,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment_id = $images[ $match[0] ];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'width' and 'height' attributes if applicable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $attachment_id > 0 && false === strpos( $filtered_image, ' width=' ) && false === strpos( $filtered_image, ' height=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $attachment_id > 0 && ! str_contains( $filtered_image, ' width=' ) && ! str_contains( $filtered_image, ' height=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_image = wp_img_tag_add_width_and_height_attr( $filtered_image, $context, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'srcset' and 'sizes' attributes if applicable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $attachment_id > 0 && false === strpos( $filtered_image, ' srcset=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $attachment_id > 0 && ! str_contains( $filtered_image, ' srcset=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_image = wp_img_tag_add_srcset_and_sizes_attr( $filtered_image, $context, $attachment_id );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'loading' attribute if applicable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $add_img_loading_attr && false === strpos( $filtered_image, ' loading=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $add_img_loading_attr && ! str_contains( $filtered_image, ' loading=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_image = wp_img_tag_add_loading_attr( $filtered_image, $context );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1894,7 +1894,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $filtered_iframe = $match[0];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'loading' attribute if applicable.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $add_iframe_loading_attr && false === strpos( $filtered_iframe, ' loading=' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $add_iframe_loading_attr && ! str_contains( $filtered_iframe, ' loading=' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $filtered_iframe = wp_iframe_tag_add_loading_attr( $filtered_iframe, $context );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1928,7 +1928,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = wp_get_loading_attr_default( $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Images should have source and dimension attributes for the `loading` attribute to be added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $image, ' src="' ) || false === strpos( $image, ' width="' ) || false === strpos( $image, ' height="' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $image, ' src="' ) || ! str_contains( $image, ' width="' ) || ! str_contains( $image, ' height="' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $image;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1979,7 +1979,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_img_tag_add_decoding_attr( $image, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Only apply the decoding attribute to images that have a src attribute that
</span><span class="cx" style="display: block; padding: 0 10px"> // starts with a double quote, ensuring escaped JSON is also excluded.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $image, ' src="' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $image, ' src="' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $image;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2097,7 +2097,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_iframe_tag_add_loading_attr( $iframe, $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Iframes with fallback content (see `wp_filter_oembed_result()`) should not be lazy-loaded because they are
</span><span class="cx" style="display: block; padding: 0 10px"> // visually hidden initially.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $iframe, ' data-secret="' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $iframe, ' data-secret="' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $iframe;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2106,7 +2106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = wp_get_loading_attr_default( $context );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Iframes should have source and dimension attributes for the `loading` attribute to be added.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $iframe, ' src="' ) || false === strpos( $iframe, ' width="' ) || false === strpos( $iframe, ' height="' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $iframe, ' src="' ) || ! str_contains( $iframe, ' width="' ) || ! str_contains( $iframe, ' height="' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $iframe;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2259,7 +2259,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $attr['caption'] = trim( $matches[2] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $attr['caption'], '<' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $attr['caption'], '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $attr['caption'] = wp_kses( $attr['caption'], '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">@@ -3524,7 +3524,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $content ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $content, "\n" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $content, "\n" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $html .= trim( $content );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3729,7 +3729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $objects = array( 'attachment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $filename, '.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $filename, '.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $objects[] = 'attachment:' . substr( $filename, strrpos( $filename, '.' ) + 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">@@ -3736,7 +3736,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $attachment->post_mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $objects[] = 'attachment:' . $attachment->post_mime_type;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $attachment->post_mime_type, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( explode( '/', $attachment->post_mime_type ) as $token ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $token ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $objects[] = "attachment:$token";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4030,7 +4030,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_scripts = wp_scripts();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $wp_scripts->get_data( 'wp-plupload', 'data' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $data && str_contains( $data, '_wpPluploadSettings' ) ) {
</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">@@ -4175,7 +4175,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"> $meta = wp_get_attachment_metadata( $attachment->ID );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $attachment->post_mime_type, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/ms-deprecated.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -317,8 +317,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wpmu_admin_redirect_add_updated_param( $url = '' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '3.3.0', 'add_query_arg()' );
</span><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, 'updated=true' ) === false ) {
- if ( strpos( $url, '?' ) === false )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $url, 'updated=true' ) ) {
+ if ( ! str_contains( $url, '?' ) )
</ins><span class="cx" style="display: block; padding: 0 10px"> return $url . '?updated=true';
</span><span class="cx" style="display: block; padding: 0 10px"> else
</span><span class="cx" style="display: block; padding: 0 10px"> return $url . '&updated=true';
</span></span></pre></div>
<a id="trunksrcwpincludesmsfilesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-files.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-files.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/ms-files.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,7 +41,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"> header( 'Content-Type: ' . $mimetype ); // Always send this.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! str_contains( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> header( 'Content-Length: ' . filesize( $file ) );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/ms-functions.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1992,7 +1992,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $site_mimes = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $site_exts as $ext ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $mimes as $ext_pattern => $mime ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' !== $ext && false !== strpos( $ext_pattern, $ext ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' !== $ext && str_contains( $ext_pattern, $ext ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_mimes[ $ext_pattern ] = $mime;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2165,7 +2165,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function maybe_add_existing_user_to_blog() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $_SERVER['REQUEST_URI'], '/newbloguser/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $_SERVER['REQUEST_URI'], '/newbloguser/' ) ) {
</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="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/pluggable.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -279,7 +279,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $tempheaders ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Iterate through the raw headers.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $tempheaders as $header ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $header, ':' ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $header, ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $header, 'boundary=' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = preg_split( '/boundary=/i', trim( $header ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -315,7 +315,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> case 'content-type':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $content, ';' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $content, ';' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $type, $charset_content ) = explode( ';', $content );
</span><span class="cx" style="display: block; padding: 0 10px"> $content_type = trim( $type );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== stripos( $charset_content, 'charset=' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1186,7 +1186,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $secure = apply_filters( 'secure_auth_redirect', $secure );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If https is required and request is http, redirect.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $secure && ! is_ssl() && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $secure && ! is_ssl() && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1217,7 +1217,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'auth_redirect', $user_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the user wants ssl but the session is not ssl, redirect.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && false !== strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $secure && get_user_option( 'use_ssl', $user_id ) && str_contains( $_SERVER['REQUEST_URI'], 'wp-admin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $_SERVER['REQUEST_URI'], 'http' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> exit;
</span></span></pre></div>
<a id="trunksrcwpincludespomopophp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pomo/po.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pomo/po.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/pomo/po.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +128,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $input_string ) ) . $quote;
</span><span class="cx" style="display: block; padding: 0 10px"> // Add empty string on first line for readbility.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $input_string, $newline ) &&
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $input_string, $newline ) &&
</ins><span class="cx" style="display: block; padding: 0 10px"> ( substr_count( $input_string, $newline ) > 1 || substr( $input_string, -strlen( $newline ) ) !== $newline ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $po = "$quote$quote$newline$po";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/post-template.php 2023-06-22 14:34:56 UTC (rev 55988)
</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"> $content = array( $content );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || 1 == $elements['page'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $_post->post_content, '<!--noteaser-->' ) && ( ! $elements['multipage'] || 1 == $elements['page'] ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $strip_teaser = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/post.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2774,7 +2774,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"> $prefixed = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $field, 'post_' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $field, 'post_' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $prefixed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> $field_no_prefix = str_replace( 'post_', '', $field );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3273,7 +3273,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $patternses[][ $type ] = "^$regex$";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $mime, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $mime, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $patternses[][ $type ] = "^$regex/";
</span><span class="cx" style="display: block; padding: 0 10px"> $patternses[][ $type ] = $regex;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3330,7 +3330,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_pattern = "$mime_group/$mime_subgroup";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_pattern = preg_replace( '/[^-*.a-zA-Z0-9]/', '', $mime_type );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $mime_pattern, '*' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $mime_pattern, '*' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $mime_pattern .= '/*';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3341,7 +3341,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 ( false !== strpos( $mime_pattern, '%' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $mime_pattern, '%' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $wheres[] = empty( $table_alias ) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $wheres[] = empty( $table_alias ) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6124,10 +6124,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True on success, false on failure.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function is_local_attachment( $url ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $url, home_url() ) === false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $url, home_url() ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $url, home_url( '/?attachment_id=' ) ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $url, home_url( '/?attachment_id=' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6510,7 +6510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( str_starts_with( $file, $uploads['basedir'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Replace file location with url location.
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( $uploads['basedir'], $uploads['baseurl'], $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( false !== strpos( $file, 'wp-content/uploads' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $file, 'wp-content/uploads' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Get the directory name relative to the basedir (back compat for pre-2.7 uploads).
</span><span class="cx" style="display: block; padding: 0 10px"> $url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . wp_basename( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiclasswprestrequestphp"></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/class-wp-rest-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/rest-api/class-wp-rest-request.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,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"> $value = strtolower( $value );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $value, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $value, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return null;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestautosavescontrollerphp"></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/endpoints/class-wp-rest-autosaves-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-autosaves-controller.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -304,7 +304,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = wp_get_post_revisions( $parent_id, array( 'check_enabled' => false ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $revision->post_name, "{$parent_id}-autosave" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $revision->post_name, "{$parent_id}-autosave" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = $this->prepare_item_for_response( $revision, $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $response[] = $this->prepare_response_for_collection( $data );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestpluginscontrollerphp"></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/endpoints/class-wp-rest-plugins-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-plugins-controller.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -298,7 +298,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_wp_error( $api ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $api->get_error_message(), 'Plugin not found.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $api->get_error_message(), 'Plugin not found.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $api->add_data( array( 'status' => 404 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $api->add_data( array( 'status' => 500 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -809,7 +809,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $matched_search = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $item as $field ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( is_string( $field ) && false !== strpos( strip_tags( $field ), $search ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( is_string( $field ) && str_contains( strip_tags( $field ), $search ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $matched_search = true;
</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="trunksrcwpincludesrestapiendpointsclasswprestuserscontrollerphp"></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/endpoints/class-wp-rest-users-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1305,7 +1305,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $password, '\\' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $password, '\\' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rest_user_invalid_password',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/revision.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -138,7 +138,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $revisions ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Grab the latest revision, but not an autosave.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $revisions as $revision ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $latest_revision = $revision;
</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">@@ -223,7 +223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $revisions = array_slice( $revisions, 0, $delete );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; isset( $revisions[ $i ] ); $i++ ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $revisions[ $i ]->post_name, 'autosave' ) ) {
</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">@@ -313,7 +313,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 ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $post->post_name, "{$post->post_parent}-autosave" ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return (int) $post->post_parent;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/rewrite.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,12 +542,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, $scheme );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add 'www.' if it is absent and should be there.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( home_url(), '://www.' ) && false === strpos( $url, '://www.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( home_url(), '://www.' ) && ! str_contains( $url, '://www.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '://', '://www.', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip 'www.' if it is present and shouldn't be.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( home_url(), '://www.' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( home_url(), '://www.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( '://www.', '://', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -572,7 +572,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( $wp_rewrite->index . '/', '', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( trailingslashit( $url ), home_url( '/' ) ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( trailingslashit( $url ), home_url( '/' ) ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Chop off http://domain.com/[path].
</span><span class="cx" style="display: block; padding: 0 10px"> $url = str_replace( home_url(), '', $url );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/script-loader.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -651,7 +651,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // 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">- $develop_src = false !== strpos( $wp_version, '-src' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $develop_src = str_contains( $wp_version, '-src' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'SCRIPT_DEBUG' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> define( 'SCRIPT_DEBUG', $develop_src );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1480,7 +1480,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"> if ( ! defined( 'SCRIPT_DEBUG' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- define( 'SCRIPT_DEBUG', false !== strpos( $wp_version, '-src' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ define( 'SCRIPT_DEBUG', str_contains( $wp_version, '-src' ) );
</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"> $guessurl = site_url();
</span></span></pre></div>
<a id="trunksrcwpincludesshortcodesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/shortcodes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/shortcodes.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/shortcodes.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool Whether the passed content contains the given shortcode.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function has_shortcode( $content, $tag ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, '[' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, '[' ) ) {
</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">@@ -205,7 +205,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function do_shortcode( $content, $ignore_html = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, '[' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, '[' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -412,8 +412,8 @@
</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">- $noopen = false === strpos( $element, '[' );
- $noclose = false === strpos( $element, ']' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $noopen = ! str_contains( $element, '[' );
+ $noclose = ! str_contains( $element, ']' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $noopen || $noclose ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // This element does not contain shortcodes.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $noopen xor $noclose ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,7 +559,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Reject any unclosed HTML elements.
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $atts as &$value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $value, '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $value, '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 1 !== preg_match( '/^[^<]*+(?:<[^>]*+>[^<]*+)*+$/', $value ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = '';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -634,7 +634,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function strip_shortcodes( $content ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $shortcode_tags;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $content, '[' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $content, '[' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/template.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/template.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -662,7 +662,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $templates = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $attachment->post_mime_type, '/' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
</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 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/user.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1765,7 +1765,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prefixed = false !== strpos( $field, 'user_' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prefixed = str_contains( $field, 'user_' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'edit' === $context ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $prefixed ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2989,7 +2989,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $user->user_activation_key, ':' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $user->user_activation_key, ':' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> list( $pass_request_time, $pass_key ) = explode( ':', $user->user_activation_key, 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $expiration_time = $pass_request_time + $expiration_duration;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpincludesvarsphp"></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/vars.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/vars.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/vars.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,9 +65,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $is_edge = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_SERVER['HTTP_USER_AGENT'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Lynx' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Lynx' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_lynx = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Edg' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Edg' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_edge = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chrome' ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( stripos( $_SERVER['HTTP_USER_AGENT'], 'chromeframe' ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,15 +89,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( stripos( $_SERVER['HTTP_USER_AGENT'], 'safari' ) !== false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_safari = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false || strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) !== false ) && strpos( $_SERVER['HTTP_USER_AGENT'], 'Win' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Trident' ) ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Win' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_winIE = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'MSIE' ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mac' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_macIE = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Gecko' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Gecko' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_gecko = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_opera = true;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Nav' ) !== false && strpos( $_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Nav' ) && str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mozilla/4.' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_NS4 = 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">@@ -115,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_apache
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$is_apache = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) !== false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$is_apache = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Apache' ) || str_contains( $_SERVER['SERVER_SOFTWARE'], 'LiteSpeed' ) );
</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"> * Whether the server software is Nginx or something else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -122,7 +122,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_nginx
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$is_nginx = ( strpos( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) !== false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$is_nginx = ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'nginx' ) );
</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"> * Whether the server software is IIS or something else
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +129,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_IIS
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$is_IIS = ! $is_apache && ( strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) !== false || strpos( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) !== false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$is_IIS = ! $is_apache && ( str_contains( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) || str_contains( $_SERVER['SERVER_SOFTWARE'], 'ExpressionDevServer' ) );
</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"> * Whether the server software is IIS 7.X or greater
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,13 +148,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_is_mobile() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_mobile = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) !== false // Many mobile devices (all iPhone, iPad, etc.)
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'Android' ) !== false
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'Silk/' ) !== false
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'Kindle' ) !== false
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'BlackBerry' ) !== false
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mini' ) !== false
- || strpos( $_SERVER['HTTP_USER_AGENT'], 'Opera Mobi' ) !== false ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( str_contains( $_SERVER['HTTP_USER_AGENT'], 'Mobile' ) // Many mobile devices (all iPhone, iPad, etc.)
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Android' )
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Silk/' )
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Kindle' )
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'BlackBerry' )
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera Mini' )
+ || str_contains( $_SERVER['HTTP_USER_AGENT'], 'Opera Mobi' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_mobile = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $is_mobile = false;
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgettextphp"></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-text.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-text.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-includes/widgets/class-wp-widget-text.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +101,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $wpautop = ! empty( $instance['filter'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $has_line_breaks = ( false !== strpos( trim( $instance['text'] ), "\n" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $has_line_breaks = ( str_contains( trim( $instance['text'] ), "\n" ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If auto-paragraphs are not enabled and there are line breaks, then ensure legacy mode.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $wpautop && $has_line_breaks ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +109,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If an HTML comment is present, assume legacy mode.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false !== strpos( $instance['text'], '<!--' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( str_contains( $instance['text'], '<!--' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-load.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-load.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,7 +69,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $path = wp_guess_url() . '/wp-admin/setup-config.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirect to setup-config.php.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( false === strpos( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! str_contains( $_SERVER['REQUEST_URI'], 'setup-config' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> header( 'Location: ' . $path );
</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="trunksrcwploginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-login.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-login.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-login.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,7 +1229,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['redirect_to'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = $_REQUEST['redirect_to'];
</span><span class="cx" style="display: block; padding: 0 10px"> // Redirect to HTTPS if user wants SSL.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $secure_cookie && false !== strpos( $redirect_to, 'wp-admin' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $secure_cookie && str_contains( $redirect_to, 'wp-admin' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $redirect_to = preg_replace( '|^http://|', 'https://', $redirect_to );
</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">@@ -1366,7 +1366,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'updated', __( '<strong>You have successfully updated WordPress!</strong> Please log back in to see what’s new.' ), 'message' );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( WP_Recovery_Mode_Link_Service::LOGIN_ACTION_ENTERED === $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $errors->add( 'enter_recovery_mode', __( 'Recovery Mode Initialized. Please log in to continue.' ), 'message' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $_GET['redirect_to'] ) && false !== strpos( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( isset( $_GET['redirect_to'] ) && str_contains( $_GET['redirect_to'], 'wp-admin/authorize-application.php' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query_component = wp_parse_url( $_GET['redirect_to'], PHP_URL_QUERY );
</span><span class="cx" style="display: block; padding: 0 10px"> $query = array();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $query_component ) {
</span></span></pre></div>
<a id="trunksrcwpmailphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-mail.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-mail.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-mail.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,7 +107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $content_transfer_encoding = explode( ';', $content_transfer_encoding );
</span><span class="cx" style="display: block; padding: 0 10px"> $content_transfer_encoding = $content_transfer_encoding[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 ( ( 'multipart/alternative' === $content_type ) && ( false !== strpos( $line, 'boundary="' ) ) && ( '' === $boundary ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 'multipart/alternative' === $content_type ) && ( str_contains( $line, 'boundary="' ) ) && ( '' === $boundary ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $boundary = trim( $line );
</span><span class="cx" style="display: block; padding: 0 10px"> $boundary = explode( '"', $boundary );
</span><span class="cx" style="display: block; padding: 0 10px"> $boundary = $boundary[1];
</span></span></pre></div>
<a id="trunksrcwptrackbackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-trackback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-trackback.php 2023-06-22 14:12:09 UTC (rev 55987)
+++ trunk/src/wp-trackback.php 2023-06-22 14:34:56 UTC (rev 55988)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,7 +65,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // No valid uses for UTF-7.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( false !== strpos( $charset, 'UTF-7' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( str_contains( $charset, 'UTF-7' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> die;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>