<!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>[49108] trunk: General: Replace older-style PHP type conversion functions with type casts.</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/49108">49108</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/49108","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-10-08 21:13:57 +0000 (Thu, 08 Oct 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>General: Replace older-style PHP type conversion functions with type casts.
This improves performance, readability, and consistency throughout core.
* `intval()` {U+2192} `(int)`
* `strval()` {U+2192} `(string)`
* `floatval()` {U+2192} `(float)`
Props ayeshrajans.
Fixes <a href="https://core.trac.wordpress.org/ticket/42918">#42918</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminadminheaderphp">trunk/src/wp-admin/admin-header.php</a></li>
<li><a href="#trunksrcwpadminasyncuploadphp">trunk/src/wp-admin/async-upload.php</a></li>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswalkernavmenuchecklistphp">trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpimporterphp">trunk/src/wp-admin/includes/class-wp-importer.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmssiteslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmsthemeslisttablephp">trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswppostslisttablephp">trunk/src/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpuserslisttablephp">trunk/src/wp-admin/includes/class-wp-users-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesdashboardphp">trunk/src/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminincludesnavmenuphp">trunk/src/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpadminincludespluginphp">trunk/src/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpadminincludesupdatephp">trunk/src/wp-admin/includes/update.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpadminmediauploadphp">trunk/src/wp-admin/media-upload.php</a></li>
<li><a href="#trunksrcwpadminnavmenusphp">trunk/src/wp-admin/nav-menus.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteinfophp">trunk/src/wp-admin/network/site-info.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesettingsphp">trunk/src/wp-admin/network/site-settings.php</a></li>
<li><a href="#trunksrcwpadminnetworksitethemesphp">trunk/src/wp-admin/network/site-themes.php</a></li>
<li><a href="#trunksrcwpadminnetworksiteusersphp">trunk/src/wp-admin/network/site-users.php</a></li>
<li><a href="#trunksrcwpadminnetworksitesphp">trunk/src/wp-admin/network/sites.php</a></li>
<li><a href="#trunksrcwpadminnetworkupgradephp">trunk/src/wp-admin/network/upgrade.php</a></li>
<li><a href="#trunksrcwpadminnetworkusersphp">trunk/src/wp-admin/network/users.php</a></li>
<li><a href="#trunksrcwpadminusersphp">trunk/src/wp-admin/users.php</a></li>
<li><a href="#trunksrcwpcommentspostphp">trunk/src/wp-comments-post.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp">trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</a></li>
<li><a href="#trunksrcwpincludescategorytemplatephp">trunk/src/wp-includes/category-template.php</a></li>
<li><a href="#trunksrcwpincludesclasshttpphp">trunk/src/wp-includes/class-http.php</a></li>
<li><a href="#trunksrcwpincludesclassjsonphp">trunk/src/wp-includes/class-json.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="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
<li><a href="#trunksrcwpincludesclasswpdatequeryphp">trunk/src/wp-includes/class-wp-date-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcurlphp">trunk/src/wp-includes/class-wp-http-curl.php</a></li>
<li><a href="#trunksrcwpincludesclasswpmatchesmapregexphp">trunk/src/wp-includes/class-wp-matchesmapregex.php</a></li>
<li><a href="#trunksrcwpincludesclasswpnetworkqueryphp">trunk/src/wp-includes/class-wp-network-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpqueryphp">trunk/src/wp-includes/class-wp-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpsitequeryphp">trunk/src/wp-includes/class-wp-site-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswptermqueryphp">trunk/src/wp-includes/class-wp-term-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserphp">trunk/src/wp-includes/class-wp-user.php</a></li>
<li><a href="#trunksrcwpincludesclasswpxmlrpcserverphp">trunk/src/wp-includes/class-wp-xmlrpc-server.php</a></li>
<li><a href="#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="#trunksrcwpincludescustomizeclasswpcustomizedatetimecontrolphp">trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusectionphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-section.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp">trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</a></li>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeshttpphp">trunk/src/wp-includes/http.php</a></li>
<li><a href="#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="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesnavmenuphp">trunk/src/wp-includes/nav-menu.php</a></li>
<li><a href="#trunksrcwpincludespluggablephp">trunk/src/wp-includes/pluggable.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblockdirectorycontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestblockrenderercontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php</a></li>
<li><a href="#trunksrcwpincludesrestapiphp">trunk/src/wp-includes/rest-api.php</a></li>
<li><a href="#trunksrcwpincludesrevisionphp">trunk/src/wp-includes/revision.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesupdatephp">trunk/src/wp-includes/update.php</a></li>
<li><a href="#trunksrcwpincludesvarsphp">trunk/src/wp-includes/vars.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetlinksphp">trunk/src/wp-includes/widgets/class-wp-widget-links.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaphp">trunk/src/wp-includes/widgets/class-wp-widget-media.php</a></li>
<li><a href="#trunksrcwptrackbackphp">trunk/src/wp-trackback.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestscommentsubmissionphp">trunk/tests/phpunit/tests/comment-submission.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
<li><a href="#trunktestsphpunittestscustomizepartialphp">trunk/tests/phpunit/tests/customize/partial.php</a></li>
<li><a href="#trunktestsphpunittestscustomizewidgetsphp">trunk/tests/phpunit/tests/customize/widgets.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditorImagickphp">trunk/tests/phpunit/tests/image/editorImagick.php</a></li>
<li><a href="#trunktestsphpunittestsoptionmultisitephp">trunk/tests/phpunit/tests/option/multisite.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestpostscontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</a></li>
<li><a href="#trunktestsphpunitteststermgetTermLinkphp">trunk/tests/phpunit/tests/term/getTermLink.php</a></li>
<li><a href="#trunktestsphpunitteststermtermExistsphp">trunk/tests/phpunit/tests/term/termExists.php</a></li>
<li><a href="#trunktestsphpunitteststermwpDeleteTermphp">trunk/tests/phpunit/tests/term/wpDeleteTerm.php</a></li>
<li><a href="#trunktestsphpunitteststermwpSetObjectTermsphp">trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</a></li>
<li><a href="#trunktestsphpunittestsuserwpGetUsersWithNoRolephp">trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</a></li>
<li><a href="#trunktestsphpunittestsxmlrpcwpgetPostsphp">trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminadminheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/admin-header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/admin-header.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/admin-header.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -170,7 +170,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' taxonomy-' . $current_screen->taxonomy;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( get_bloginfo( 'version' ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', (float) get_bloginfo( 'version' ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', get_bloginfo( 'version' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
</span><span class="cx" style="display: block; padding: 0 10px"> $admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_user_locale() ) ) );
</span></span></pre></div>
<a id="trunksrcwpadminasyncuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/async-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/async-upload.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/async-upload.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Just fetch the detail form for that attachment.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( isset( $_REQUEST['attachment_id'] ) && intval( $_REQUEST['attachment_id'] ) && $_REQUEST['fetch'] ) {
- $id = intval( $_REQUEST['attachment_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( isset( $_REQUEST['attachment_id'] ) && (int) $_REQUEST['attachment_id'] && $_REQUEST['fetch'] ) {
+ $id = (int) $_REQUEST['attachment_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' !== $post->post_type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type.' ) );
</span></span></pre></div>
<a id="trunksrcwpadmineditcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/edit-comments.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $wp_list_table->search_box( __( 'Search Comments' ), 'comment' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( $post_id ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<input type="hidden" name="p" value="<?php echo esc_attr( intval( $post_id ) ); ?>" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<input type="hidden" name="p" value="<?php echo esc_attr( (int) $post_id ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="comment_status" value="<?php echo esc_attr( $comment_status ); ?>" />
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr( current_time( 'mysql', 1 ) ); ?>" />
</span></span></pre></div>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -227,7 +227,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_imgedit_preview() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = intval( $_GET['postid'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $_GET['postid'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1954,7 +1954,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_get_permalink() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_POST['post_id'] ) ? intval( $_POST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_die( get_preview_post_link( $post_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1965,7 +1965,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_sample_permalink() {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_POST['post_id'] ) ? intval( $_POST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_POST['post_id'] ) ? (int) $_POST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = isset( $_POST['new_title'] ) ? $_POST['new_title'] : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = isset( $_POST['new_slug'] ) ? $_POST['new_slug'] : null;
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( get_sample_permalink_html( $post_id, $title, $slug ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2594,7 +2594,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_image_editor() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = intval( $_POST['postid'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = (int) $_POST['postid'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attachment_id ) || ! current_user_can( 'edit_post', $attachment_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2651,12 +2651,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_set_post_thumbnail() {
</span><span class="cx" style="display: block; padding: 0 10px"> $json = ! empty( $_REQUEST['json'] ); // New-style request.
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ID = intval( $_POST['post_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID = (int) $_POST['post_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! current_user_can( 'edit_post', $post_ID ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thumbnail_id = intval( $_POST['thumbnail_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumbnail_id = (int) $_POST['thumbnail_id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "update-post_$post_ID" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2687,7 +2687,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_ajax_get_post_thumbnail_html() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_ID = intval( $_POST['post_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_ID = (int) $_POST['post_id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_ajax_referer( "update-post_$post_ID" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2695,7 +2695,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( -1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thumbnail_id = intval( $_POST['thumbnail_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumbnail_id = (int) $_POST['thumbnail_id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For backward compatibility, -1 refers to no featured image.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 === $thumbnail_id ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3208,7 +3208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $attachment = wp_unslash( $_POST['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">- $id = intval( $attachment['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = (int) $attachment['id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $post ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3221,7 +3221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_user_can( 'edit_post', $id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If this attachment is unattached, attach it. Primarily a back compat thing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $insert_into_post_id = intval( $_POST['post_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $insert_into_post_id = (int) $_POST['post_id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $post->post_parent && $insert_into_post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_update_post(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3622,7 +3622,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_POST['post_ID'] ) ? intval( $_POST['post_ID'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3674,9 +3674,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Set $content_width so any embeds fit in the destination iframe.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['maxwidth'] ) && is_numeric( $_POST['maxwidth'] ) && $_POST['maxwidth'] > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $content_width ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content_width = intval( $_POST['maxwidth'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content_width = (int) $_POST['maxwidth'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content_width = min( $content_width, intval( $_POST['maxwidth'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $content_width = min( $content_width, (int) $_POST['maxwidth'] );
</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="trunksrcwpadminincludesclasswalkernavmenuchecklistphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-walker-nav-menu-checklist.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -74,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function start_el( &$output, $item, $depth = 0, $args = null, $id = 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $_nav_menu_placeholder, $nav_menu_selected_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $possible_object_id = isset( $item->post_type ) && 'nav_menu_item' === $item->post_type ? $item->object_id : $_nav_menu_placeholder;
</span><span class="cx" style="display: block; padding: 0 10px"> $possible_db_id = ( ! empty( $item->ID ) ) && ( 0 < $possible_object_id ) ? (int) $item->ID : 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpimporterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-importer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-importer.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-wp-importer.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +37,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $results ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $r ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Set permalinks into array.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hashtable[ $r->meta_value ] = intval( $r->post_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hashtable[ $r->meta_value ] = (int) $r->post_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } while ( count( $results ) == $limit );
</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"> $result = $wpdb->get_results( $sql );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $result ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $count = intval( $result[0]->cnt );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $count = (int) $result[0]->cnt;
</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"> // Unset to save memory.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,11 +106,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results as $r ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Explode comment_agent key.
</span><span class="cx" style="display: block; padding: 0 10px"> list ( $ca_bid, $source_comment_id ) = explode( '-', $r->comment_agent );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $source_comment_id = intval( $source_comment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $source_comment_id = (int) $source_comment_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check if this comment came from this blog.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $bid == $ca_bid ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hashtable[ $source_comment_id ] = intval( $r->comment_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hashtable[ $source_comment_id ] = (int) $r->comment_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmssiteslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-wp-ms-sites-list-table.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,8 +103,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"> $args = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'number' => intval( $per_page ),
- 'offset' => intval( ( $pagenum - 1 ) * $per_page ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'number' => (int) $per_page,
+ 'offset' => (int) ( ( $pagenum - 1 ) * $per_page ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'network_id' => get_current_network_id(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $site_status = isset( $_REQUEST['status'] ) ? wp_unslash( trim( $_REQUEST['status'] ) ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $this->status_list as $status => $col ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( 1 === intval( $_site->{$status} ) ) && ( $site_status !== $status ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( 1 === (int) $_site->{$status} ) && ( $site_status !== $status ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_states[ $col[0] ] = $col[1];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmsthemeslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-wp-ms-themes-list-table.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,7 +63,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_site_themes = ( 'site-themes-network' === $this->screen->id ) ? true : false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_themes ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->show_autoupdates = wp_is_auto_update_enabled_for_type( 'theme' ) &&
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-posts-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-wp-posts-list-table.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -89,10 +89,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_admin_all_list' => 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">- $this->user_posts_count = intval(
- $wpdb->get_var(
- $wpdb->prepare(
- "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->user_posts_count = (int) $wpdb->get_var(
+ $wpdb->prepare(
+ "
</ins><span class="cx" style="display: block; padding: 0 10px"> SELECT COUNT( 1 )
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = %s
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,9 +98,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_author = %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">- $post_type,
- get_current_user_id()
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_type,
+ get_current_user_id()
</ins><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpuserslisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-users-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-users-list-table.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/class-wp-users-list-table.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -54,7 +54,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_site_users = 'site-users-network' === $this->screen->id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->is_site_users ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->site_id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->site_id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesdashboardphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/dashboard.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/dashboard.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/dashboard.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,7 +606,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<h2 class="hide-if-no-js">' . __( 'Your Recent Drafts' ) . "</h2>\n<ul>";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Maximum number of words used in a preview of a draft on the dashboard. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $draft_length = intval( _x( '10', 'draft_length' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $draft_length = (int) _x( '10', 'draft_length' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $drafts = array_slice( $drafts, 0, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $drafts as $draft ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -928,7 +928,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_status' => $args['status'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'orderby' => 'date',
</span><span class="cx" style="display: block; padding: 0 10px"> 'order' => $args['order'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'posts_per_page' => intval( $args['max'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'posts_per_page' => (int) $args['max'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no_found_rows' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'cache_results' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'perm' => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/export.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -372,7 +372,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $authors as $author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\t<wp:author>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<wp:author_id>' . intval( $author->ID ) . '</wp:author_id>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<wp:author_id>' . (int) $author->ID . '</wp:author_id>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<wp:author_login>' . wxr_cdata( $author->user_login ) . '</wp:author_login>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<wp:author_email>' . wxr_cdata( $author->user_email ) . '</wp:author_email>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<wp:author_display_name>' . wxr_cdata( $author->display_name ) . '</wp:author_display_name>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,7 +395,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $nav_menus as $menu ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo "\t<wp:term>";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo '<wp:term_id>' . intval( $menu->term_id ) . '</wp:term_id>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo '<wp:term_id>' . (int) $menu->term_id . '</wp:term_id>';
</ins><span class="cx" style="display: block; padding: 0 10px"> echo '<wp:term_taxonomy>nav_menu</wp:term_taxonomy>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<wp:term_slug>' . wxr_cdata( $menu->slug ) . '</wp:term_slug>';
</span><span class="cx" style="display: block; padding: 0 10px"> wxr_term_name( $menu );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -478,7 +478,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $cats as $c ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:category>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:term_id><?php echo intval( $c->term_id ); ?></wp:term_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:term_id><?php echo (int) $c->term_id; ?></wp:term_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:category_nicename><?php echo wxr_cdata( $c->slug ); ?></wp:category_nicename>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:category_parent><?php echo wxr_cdata( $c->parent ? $cats[ $c->parent ]->slug : '' ); ?></wp:category_parent>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -490,7 +490,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $tags as $t ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:tag>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:term_id><?php echo (int) $t->term_id; ?></wp:term_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:tag_slug><?php echo wxr_cdata( $t->slug ); ?></wp:tag_slug>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> wxr_tag_name( $t );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +501,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $terms as $t ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:term_id><?php echo intval( $t->term_id ); ?></wp:term_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:term_id><?php echo (int) $t->term_id; ?></wp:term_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:term_taxonomy><?php echo wxr_cdata( $t->taxonomy ); ?></wp:term_taxonomy>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_slug><?php echo wxr_cdata( $t->slug ); ?></wp:term_slug>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:term_parent><?php echo wxr_cdata( $t->parent ? $terms[ $t->parent ]->slug : '' ); ?></wp:term_parent>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -573,7 +573,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <description></description>
</span><span class="cx" style="display: block; padding: 0 10px"> <content:encoded><?php echo $content; ?></content:encoded>
</span><span class="cx" style="display: block; padding: 0 10px"> <excerpt:encoded><?php echo $excerpt; ?></excerpt:encoded>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:post_id><?php echo intval( $post->ID ); ?></wp:post_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:post_id><?php echo (int) $post->ID; ?></wp:post_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:post_date><?php echo wxr_cdata( $post->post_date ); ?></wp:post_date>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_date_gmt><?php echo wxr_cdata( $post->post_date_gmt ); ?></wp:post_date_gmt>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_status><?php echo wxr_cdata( $post->comment_status ); ?></wp:comment_status>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,11 +580,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:ping_status><?php echo wxr_cdata( $post->ping_status ); ?></wp:ping_status>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_name><?php echo wxr_cdata( $post->post_name ); ?></wp:post_name>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:status><?php echo wxr_cdata( $post->post_status ); ?></wp:status>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:post_parent><?php echo intval( $post->post_parent ); ?></wp:post_parent>
- <wp:menu_order><?php echo intval( $post->menu_order ); ?></wp:menu_order>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:post_parent><?php echo (int) $post->post_parent; ?></wp:post_parent>
+ <wp:menu_order><?php echo (int) $post->menu_order; ?></wp:menu_order>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:post_type><?php echo wxr_cdata( $post->post_type ); ?></wp:post_type>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:post_password><?php echo wxr_cdata( $post->post_password ); ?></wp:post_password>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:is_sticky><?php echo intval( $is_sticky ); ?></wp:is_sticky>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:is_sticky><?php echo (int) $is_sticky; ?></wp:is_sticky>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'attachment' === $post->post_type ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:attachment_url><?php echo wxr_cdata( wp_get_attachment_url( $post->ID ) ); ?></wp:attachment_url>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -620,7 +620,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $comments as $c ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:comment_id><?php echo intval( $c->comment_ID ); ?></wp:comment_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:comment_id><?php echo (int) $c->comment_ID; ?></wp:comment_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author><?php echo wxr_cdata( $c->comment_author ); ?></wp:comment_author>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author_email><?php echo wxr_cdata( $c->comment_author_email ); ?></wp:comment_author_email>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_author_url><?php echo esc_url_raw( $c->comment_author_url ); ?></wp:comment_author_url>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -630,8 +630,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_content><?php echo wxr_cdata( $c->comment_content ); ?></wp:comment_content>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_approved><?php echo wxr_cdata( $c->comment_approved ); ?></wp:comment_approved>
</span><span class="cx" style="display: block; padding: 0 10px"> <wp:comment_type><?php echo wxr_cdata( $c->comment_type ); ?></wp:comment_type>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <wp:comment_parent><?php echo intval( $c->comment_parent ); ?></wp:comment_parent>
- <wp:comment_user_id><?php echo intval( $c->user_id ); ?></wp:comment_user_id>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <wp:comment_parent><?php echo (int) $c->comment_parent; ?></wp:comment_parent>
+ <wp:comment_user_id><?php echo (int) $c->user_id; ?></wp:comment_user_id>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> $c_meta = $wpdb->get_results( $wpdb->prepare( "SELECT * FROM $wpdb->commentmeta WHERE comment_id = %d", $c->comment_ID ) );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $c_meta as $meta ) :
</span></span></pre></div>
<a id="trunksrcwpadminincludesfilephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/file.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -510,7 +510,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scrape_key = md5( rand() );
</span><span class="cx" style="display: block; padding: 0 10px"> $transient = 'scrape_key_' . $scrape_key;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scrape_nonce = strval( rand() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scrape_nonce = (string) rand();
</ins><span class="cx" style="display: block; padding: 0 10px"> // It shouldn't take more than 60 seconds to make the two loopback requests.
</span><span class="cx" style="display: block; padding: 0 10px"> set_transient( $transient, $scrape_nonce, 60 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/image-edit.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,8 +786,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $fwidth = ! empty( $_REQUEST['fwidth'] ) ? intval( $_REQUEST['fwidth'] ) : 0;
- $fheight = ! empty( $_REQUEST['fheight'] ) ? intval( $_REQUEST['fheight'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fwidth = ! empty( $_REQUEST['fwidth'] ) ? (int) $_REQUEST['fwidth'] : 0;
+ $fheight = ! empty( $_REQUEST['fheight'] ) ? (int) $_REQUEST['fheight'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $target = ! empty( $_REQUEST['target'] ) ? preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['target'] ) : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $scale = ! empty( $_REQUEST['do'] ) && 'scale' === $_REQUEST['do'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -944,8 +944,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 ( isset( $_wp_additional_image_sizes[ $size ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $width = intval( $_wp_additional_image_sizes[ $size ]['width'] );
- $height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $width = (int) $_wp_additional_image_sizes[ $size ]['width'];
+ $height = (int) $_wp_additional_image_sizes[ $size ]['height'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $crop = ( $nocrop ) ? false : $_wp_additional_image_sizes[ $size ]['crop'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $height = get_option( "{$size}_size_h" );
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/media.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,10 +49,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $tabs;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = intval( $_REQUEST['post_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $_REQUEST['post_id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachments = intval( $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachments = (int) $wpdb->get_var( $wpdb->prepare( "SELECT count(*) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' AND post_parent = %d", $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $attachments ) ) {
</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 ( is_string( $rel ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = ' rel="' . esc_attr( $rel ) . '"';
</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">- $rel = ' rel="attachment wp-att-' . intval( $id ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rel = ' rel="attachment wp-att-' . (int) $id . '"';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $rel = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1549,7 +1549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $redir_tab;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = intval( $attachment_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = (int) $attachment_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = wp_get_attachment_image_src( $attachment_id, 'thumbnail', true );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2035,7 +2035,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function media_upload_header() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<script type="text/javascript">post_id = ' . $post_id . ';</script>';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2071,7 +2071,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"> $upload_action_url = admin_url( 'async-upload.php' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> $_type = isset( $type ) ? $type : '';
</span><span class="cx" style="display: block; padding: 0 10px"> $_tab = isset( $tab ) ? $tab : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2281,7 +2281,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> media_upload_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action_url = admin_url( "media-upload.php?type=$type&tab=type&post_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2358,7 +2358,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> media_upload_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action_url = admin_url( "media-upload.php?type=$type&tab=type&post_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2506,7 +2506,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $redir_tab = 'gallery';
</span><span class="cx" style="display: block; padding: 0 10px"> media_upload_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = intval( $_REQUEST['post_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $_REQUEST['post_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $form_action_url = admin_url( "media-upload.php?type=$type&tab=gallery&post_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action_url = apply_filters( 'media_upload_form_url', $form_action_url, $type );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2669,7 +2669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> media_upload_header();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $_REQUEST['post_id'] ) ? intval( $_REQUEST['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $form_action_url = admin_url( "media-upload.php?type=$type&tab=library&post_id=$post_id" );
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-admin/includes/media.php */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2682,7 +2682,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $q = $_GET;
</span><span class="cx" style="display: block; padding: 0 10px"> $q['posts_per_page'] = 10;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $q['paged'] = isset( $q['paged'] ) ? intval( $q['paged'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $q['paged'] = isset( $q['paged'] ) ? (int) $q['paged'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $q['paged'] < 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['paged'] = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2984,9 +2984,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $browser_uploader .= '&post_id=' . intval( $post->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $browser_uploader .= '&post_id=' . (int) $post->ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $GLOBALS['post_ID'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $browser_uploader .= '&post_id=' . intval( $GLOBALS['post_ID'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $browser_uploader .= '&post_id=' . (int) $GLOBALS['post_ID'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3078,7 +3078,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"> $thumb_url = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_id = intval( $post->ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_id = (int) $post->ID;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $attachment_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $thumb_url = wp_get_attachment_image_src( $attachment_id, array( 900, 450 ), true );
</span></span></pre></div>
<a id="trunksrcwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/nav-menu.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/nav-menu.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,7 +382,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $important_pages[] = $front_page_obj;
</span><span class="cx" style="display: block; padding: 0 10px"> $suppress_page_ids[] = $front_page_obj->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $front_page_obj = (object) array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'front_or_home' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ID' => 0,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -609,7 +609,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $args['walker'] = $walker;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type->has_archive ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? intval( $_nav_menu_placeholder ) - 1 : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_nav_menu_placeholder = ( 0 > $_nav_menu_placeholder ) ? (int) $_nav_menu_placeholder - 1 : -1;
</ins><span class="cx" style="display: block; padding: 0 10px"> array_unshift(
</span><span class="cx" style="display: block; padding: 0 10px"> $posts,
</span><span class="cx" style="display: block; padding: 0 10px"> (object) array(
</span></span></pre></div>
<a id="trunksrcwpadminincludespluginphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/plugin.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/plugin.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1347,10 +1347,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $position ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $menu[] = $new_menu;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( isset( $menu[ "$position" ] ) ) {
- $position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), -5 ) * 0.00001;
- $menu[ "$position" ] = $new_menu;
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $menu[ $position ] ) ) {
+ $position = $position + substr( base_convert( md5( $menu_slug . $menu_title ), 16, 10 ), -5 ) * 0.00001;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menu[ $position ] = $new_menu;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/post.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1923,7 +1923,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['_thumbnail_id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_args['_thumbnail_id'] = ( intval( $_POST['_thumbnail_id'] ) <= 0 ) ? '-1' : intval( $_POST['_thumbnail_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_args['_thumbnail_id'] = ( (int) $_POST['_thumbnail_id'] <= 0 ) ? '-1' : (int) $_POST['_thumbnail_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2085,7 +2085,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( $_term ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $clean_terms[] = intval( $_term[0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $clean_terms[] = (int) $_term[0];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // No existing term was found, so pass the string. A new term will be created.
</span><span class="cx" style="display: block; padding: 0 10px"> $clean_terms[] = $term;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/template.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1321,7 +1321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span aria-hidden="true" class="dashicons dashicons-warning"></span>';
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="screen-reader-text">' . __( 'Warning:' ) . ' </span>';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo "{$box['title']}";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo $box['title'];
</ins><span class="cx" style="display: block; padding: 0 10px"> echo "</h2>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'dashboard_browser_nag' !== $box['id'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2205,16 +2205,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' === get_option( 'show_on_front' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( get_option( 'page_on_front' ) ) === $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_option( 'page_on_front' ) === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states['page_on_front'] = _x( 'Front Page', 'page label' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( get_option( 'page_for_posts' ) ) === $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_option( 'page_for_posts' ) === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states['page_for_posts'] = _x( 'Posts Page', 'page label' );
</span><span class="cx" style="display: 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 ( intval( get_option( 'wp_page_for_privacy_policy' ) ) === $post->ID ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) get_option( 'wp_page_for_privacy_policy' ) === $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_states['page_for_privacy_policy'] = _x( 'Privacy Policy Page', 'page label' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/update.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/update.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1059,7 +1059,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false === $next_update_time ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = __( 'Automatic update not scheduled. There may be a problem with WP-Cron.' );
</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">- $time_to_next_update = human_time_diff( intval( $next_update_time ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $time_to_next_update = human_time_diff( (int) $next_update_time );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // See if cron is overdue.
</span><span class="cx" style="display: block; padding: 0 10px"> $overdue = ( time() - $next_update_time ) > 0;
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/includes/upgrade.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,8 +1022,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $got_gmt_fields ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Add or subtract time to all dates, to get GMT dates.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $add_hours = intval( $diff_gmt_weblogger );
- $add_minutes = intval( 60 * ( $diff_gmt_weblogger - $add_hours ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $add_hours = (int) $diff_gmt_weblogger;
+ $add_minutes = (int) ( 60 * ( $diff_gmt_weblogger - $add_hours ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "UPDATE $wpdb->posts SET post_date_gmt = DATE_ADD(post_date, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE)" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "UPDATE $wpdb->posts SET post_modified = post_date" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "UPDATE $wpdb->posts SET post_modified_gmt = DATE_ADD(post_modified, INTERVAL '$add_hours:$add_minutes' HOUR_MINUTE) WHERE post_modified != '0000-00-00 00:00:00'" );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2048,7 +2048,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">- $allowed_length = intval( $content_length['length'] ) - 10;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $allowed_length = (int) $content_length['length'] - 10;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comments = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT `comment_ID` FROM `{$wpdb->comments}`
</span></span></pre></div>
<a id="trunksrcwpadminmediauploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/media-upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/media-upload.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/media-upload.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,7 +51,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Upload type: image, video, file, ...?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['type'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $type = strval( $_GET['type'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $type = (string) $_GET['type'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the default media upload type in the legacy (pre-3.5.0) media popup.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Tab: gallery, library, or type-specific.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['tab'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tab = strval( $_GET['tab'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tab = (string) $_GET['tab'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the default tab in the legacy (pre-3.5.0) media popup.
</span></span></pre></div>
<a id="trunksrcwpadminnavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/nav-menus.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/nav-menus.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -424,7 +424,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If the menu ID changed, redirect to the new URL.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $nav_menu_selected_id !== $_nav_menu_selected_id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_redirect( admin_url( 'nav-menus.php?menu=' . intval( $_nav_menu_selected_id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_redirect( admin_url( 'nav-menus.php?menu=' . (int) $_nav_menu_selected_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> exit;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteinfophp"></a>
<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-info.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-info.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/site-info.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid site ID.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/site-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-settings.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/site-settings.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -17,7 +17,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->add_help_tab( get_site_screen_help_tab_args() );
</span><span class="cx" style="display: block; padding: 0 10px"> get_current_screen()->set_help_sidebar( get_site_screen_help_sidebar_content() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid site ID.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitethemesphp"></a>
<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-themes.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-themes.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/site-themes.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid site ID.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksiteusersphp"></a>
<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-users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/site-users.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/site-users.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $referer = add_query_arg( 'paged', (int) $_REQUEST['paged'], $referer );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid site ID.' ) );
</span></span></pre></div>
<a id="trunksrcwpadminnetworksitesphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/sites.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/sites.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/sites.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -53,7 +53,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$id = isset( $_REQUEST['id'] ) ? (int) $_REQUEST['id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_GET['action'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /** This action is documented in wp-admin/network/edit.php */
</span></span></pre></div>
<a id="trunksrcwpadminnetworkupgradephp"></a>
<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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/upgrade.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/upgrade.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -45,7 +45,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $action ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'upgrade':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $n = ( isset( $_GET['n'] ) ) ? intval( $_GET['n'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $n = ( isset( $_GET['n'] ) ) ? (int) $_GET['n'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $n < 5 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpadminnetworkusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/network/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/network/users.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/network/users.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -26,7 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'deleteuser' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = intval( $_GET['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = (int) $_GET['id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $id > 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_POST['allusers'] = array( $id ); // confirm_delete_users() can only handle arrays.
</span><span class="cx" style="display: block; padding: 0 10px"> $title = __( 'Users' );
</span></span></pre></div>
<a id="trunksrcwpadminusersphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/users.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/users.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-admin/users.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,7 +230,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_REQUEST['users'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $userids = array( intval( $_REQUEST['user'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $userids = array( (int) $_REQUEST['user'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $userids = array_map( 'intval', (array) $_REQUEST['users'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,7 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $_REQUEST['users'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $userids = array( intval( $_REQUEST['user'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $userids = array( (int) $_REQUEST['user'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $userids = $_REQUEST['users'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpcommentspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-comments-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-comments-post.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-comments-post.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $comment = wp_handle_comment_submission( wp_unslash( $_POST ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $comment ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data = intval( $comment->get_error_data() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data = (int) $comment->get_error_data();
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $data ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die(
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . $comment->get_error_message() . '</p>',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyfourteeninctemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-content/themes/twentyfourteen/inc/template-tags.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -24,7 +24,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">- $paged = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $paged = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> $pagenum_link = html_entity_decode( get_pagenum_link() );
</span><span class="cx" style="display: block; padding: 0 10px"> $query_args = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $url_parts = explode( '?', $pagenum_link );
</span></span></pre></div>
<a id="trunksrcwpincludescategorytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/category-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/category-template.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/category-template.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +433,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /** This filter is documented in wp-includes/category-template.php */
</span><span class="cx" style="display: block; padding: 0 10px"> $show_option_all = apply_filters( 'list_cats', $parsed_args['show_option_all'], null );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $selected = ( '0' === strval( $parsed_args['selected'] ) ) ? " selected='selected'" : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $selected = ( '0' === (string) $parsed_args['selected'] ) ? " selected='selected'" : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $output .= "\t<option value='0'$selected>$show_option_all</option>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -737,7 +737,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'edit' === $args['link'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $link = get_term_link( intval( $tag->term_id ), $tag->taxonomy );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $link = get_term_link( (int) $tag->term_id, $tag->taxonomy );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $link ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesclasshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-http.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-http.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,7 +752,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"> // Cast the Response Code to an int.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $response['code'] = intval( $response['code'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $response['code'] = (int) $response['code'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'response' => $response,
</span></span></pre></div>
<a id="trunksrcwpincludesclassjsonphp"></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-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-json.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-json.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,7 +579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $encoded_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">- return $this->_encode(strval($name)) . ':' . $encoded_value;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->_encode((string) $name) . ':' . $encoded_value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcommentqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-comment-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-comment-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-comment-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,7 +456,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If querying for a count only, there's nothing more to do.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $comment_ids is actually a count in this case.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $comment_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $comment_ids;
</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"> $comment_ids = array_map( 'intval', $comment_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $wpdb->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $wpdb->get_var( $this->request );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $comment_ids = $wpdb->get_col( $this->request );
</span><span class="cx" style="display: block; padding: 0 10px"> return array_map( 'intval', $comment_ids );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1463,7 +1463,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> preg_match( '#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $can_reuse ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nav_menu_term_id = intval( $matches['nav_menu_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nav_menu_term_id = (int) $matches['nav_menu_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $nav_menu_setting_id = $setting_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $reused_nav_menu_setting_ids[] = $setting_id;
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3268,7 +3268,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $lock = explode( ':', $lock );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $lock && ! empty( $lock[1] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $user_id = intval( $lock[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $user_id = (int) $lock[1];
</ins><span class="cx" style="display: block; padding: 0 10px"> $current_user_id = get_current_user_id();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $user_id === $current_user_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $lock = sprintf( '%s:%s', time(), $user_id );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -249,8 +249,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => $post_type_label,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $post->ID ),
- 'url' => get_permalink( intval( $post->ID ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $post->ID,
+ 'url' => get_permalink( (int) $post->ID ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'taxonomy' === $type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -281,8 +281,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $term->taxonomy,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $term->term_id ),
- 'url' => get_term_link( intval( $term->term_id ), $term->taxonomy ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $term->term_id,
+ 'url' => get_term_link( (int) $term->term_id, $term->taxonomy ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -410,8 +410,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => $post_type_label,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $post->post_type,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $post->ID ),
- 'url' => get_permalink( intval( $post->ID ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $post->ID,
+ 'url' => get_permalink( (int) $post->ID ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -436,8 +436,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( $term->taxonomy )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => $term->taxonomy,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $term->term_id ),
- 'url' => get_term_link( intval( $term->term_id ), $term->taxonomy ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $term->term_id,
+ 'url' => get_term_link( (int) $term->term_id, $term->taxonomy ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> if ( preg_match( '/^(.+)-(\d+)$/', $widget_id, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed['id_base'] = $matches[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed['number'] = intval( $matches[2] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed['number'] = (int) $matches[2];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Likely an old single widget.
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed['id_base'] = $widget_id;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -628,7 +628,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $id_base = $matches[2];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $number = isset( $matches[3] ) ? intval( $matches[3] ) : null;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $number = isset( $matches[3] ) ? (int) $matches[3] : null;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return compact( 'id_base', 'number' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1772,7 +1772,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $this->sidebar_instance_count[ $index ] += 1;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( "\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( "\n<!--dynamic_sidebar_before:%s:%d-->\n", esc_html( $index ), (int) $this->sidebar_instance_count[ $index ] );
</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">@@ -1788,7 +1788,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function end_dynamic_sidebar( $index ) {
</span><span class="cx" style="display: block; padding: 0 10px"> array_shift( $this->current_dynamic_sidebar_id_stack );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->manager->selective_refresh->is_render_partials_request() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- printf( "\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html( $index ), intval( $this->sidebar_instance_count[ $index ] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ printf( "\n<!--dynamic_sidebar_after:%s:%d-->\n", esc_html( $index ), (int) $this->sidebar_instance_count[ $index ] );
</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">@@ -1851,7 +1851,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->rendering_sidebar_id = $context['sidebar_id'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $context['sidebar_instance_number'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->context_sidebar_instance_number = intval( $context['sidebar_instance_number'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->context_sidebar_instance_number = (int) $context['sidebar_instance_number'];
</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"> // Filter sidebars_widgets so that only the queried widget is in the sidebar.
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpdatequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-date-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-date-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-date-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -874,32 +874,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^(\d{4})$/', $datetime, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Y
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'year' => intval( $matches[1] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => (int) $matches[1],
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/^(\d{4})\-(\d{2})$/', $datetime, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Y-m
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'year' => intval( $matches[1] ),
- 'month' => intval( $matches[2] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => (int) $matches[1],
+ 'month' => (int) $matches[2],
</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"> } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2})$/', $datetime, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Y-m-d
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'year' => intval( $matches[1] ),
- 'month' => intval( $matches[2] ),
- 'day' => intval( $matches[3] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => (int) $matches[1],
+ 'month' => (int) $matches[2],
+ 'day' => (int) $matches[3],
</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"> } elseif ( preg_match( '/^(\d{4})\-(\d{2})\-(\d{2}) (\d{2}):(\d{2})$/', $datetime, $matches ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Y-m-d H:i
</span><span class="cx" style="display: block; padding: 0 10px"> $datetime = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'year' => intval( $matches[1] ),
- 'month' => intval( $matches[2] ),
- 'day' => intval( $matches[3] ),
- 'hour' => intval( $matches[4] ),
- 'minute' => intval( $matches[5] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'year' => (int) $matches[1],
+ 'month' => (int) $matches[2],
+ 'day' => (int) $matches[3],
+ 'hour' => (int) $matches[4],
+ 'minute' => (int) $matches[5],
</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="trunksrcwpincludesclasswphttpcurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-curl.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-http-curl.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,7 +173,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> curl_setopt( $handle, CURLOPT_HEADER, false );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $parsed_args['limit_response_size'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->max_body_length = intval( $parsed_args['limit_response_size'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->max_body_length = (int) $parsed_args['limit_response_size'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->max_body_length = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpmatchesmapregexphp"></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-matchesmapregex.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-matchesmapregex.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-matchesmapregex.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function callback( $matches ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index = intval( substr( $matches[0], 9, -1 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index = (int) substr( $matches[0], 9, -1 );
</ins><span class="cx" style="display: block; padding: 0 10px"> return ( isset( $this->_matches[ $index ] ) ? urlencode( $this->_matches[ $index ] ) : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpnetworkqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-network-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-network-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-network-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -260,7 +260,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If querying for a count only, there's nothing more to do.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $network_ids is actually a count in this case.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $network_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $network_ids;
</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"> $network_ids = array_map( 'intval', $network_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,7 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $wpdb->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $wpdb->get_var( $this->request );
</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"> $network_ids = $wpdb->get_col( $this->request );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> $qv['p'] = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> $qv['error'] = '404';
</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">- $qv['p'] = intval( $qv['p'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $qv['p'] = (int) $qv['p'];
</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"> $qv['page_id'] = absint( $qv['page_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -942,7 +942,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->is_trackback = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( '' != $qv['paged'] && ( intval( $qv['paged'] ) > 1 ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '' != $qv['paged'] && ( (int) $qv['paged'] > 1 ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->is_paged = 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">@@ -1604,7 +1604,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If RAND() contains a seed value, sanitize and add to allowed keys.
</span><span class="cx" style="display: block; padding: 0 10px"> $rand_with_seed = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/RAND\(([0-9]+)\)/i', $orderby, $matches ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $orderby = sprintf( 'RAND(%s)', (int) $matches[1] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $allowed_keys[] = $orderby;
</span><span class="cx" style="display: block; padding: 0 10px"> $rand_with_seed = true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2263,7 +2263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Numeric comment count is converted to array format.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $q['comment_count'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $q['comment_count'] = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => intval( $q['comment_count'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => (int) $q['comment_count'],
</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="trunksrcwpincludesclasswpsitequeryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-site-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-site-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-site-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,7 +351,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If querying for a count only, there's nothing more to do.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $site_ids is actually a count in this case.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $site_ids );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $site_ids;
</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"> $site_ids = array_map( 'intval', $site_ids );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,7 +660,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->query_vars['count'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $wpdb->get_var( $this->request ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $wpdb->get_var( $this->request );
</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"> $site_ids = $wpdb->get_col( $this->request );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptermqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-term-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-term-query.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-term-query.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -258,7 +258,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $query['offset'] = absint( $query['offset'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'parent' overrides 'child_of'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 < intval( $query['parent'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 < (int) $query['parent'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $query['child_of'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 'parent' overrides 'child_of'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 < intval( $args['parent'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 < (int) $args['parent'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $args['child_of'] = false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -443,7 +443,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> (array) get_terms(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'taxonomy' => reset( $taxonomies ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'child_of' => intval( $extrunk ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'child_of' => (int) $extrunk,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'fields' => 'ids',
</span><span class="cx" style="display: block; padding: 0 10px"> 'hide_empty' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-user.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,7 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_numeric( $value ) ) {
</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">- $value = intval( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = (int) $value;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $value < 1 ) {
</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">@@ -645,7 +645,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function level_reduction( $max, $item ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $level = intval( $matches[1] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $level = (int) $matches[1];
</ins><span class="cx" style="display: block; padding: 0 10px"> return max( $max, $level );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return $max;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpxmlrpcserverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-xmlrpc-server.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/class-wp-xmlrpc-server.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,13 +798,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // For integers which may be larger than XML-RPC supports ensure we return strings.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_term['term_id'] = strval( $_term['term_id'] );
- $_term['term_group'] = strval( $_term['term_group'] );
- $_term['term_taxonomy_id'] = strval( $_term['term_taxonomy_id'] );
- $_term['parent'] = strval( $_term['parent'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_term['term_id'] = (string) $_term['term_id'];
+ $_term['term_group'] = (string) $_term['term_group'];
+ $_term['term_taxonomy_id'] = (string) $_term['term_taxonomy_id'];
+ $_term['parent'] = (string) $_term['parent'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Count we are happy to return as an integer because people really shouldn't use terms that much.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_term['count'] = intval( $_term['count'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_term['count'] = (int) $_term['count'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get term meta.
</span><span class="cx" style="display: block; padding: 0 10px"> $_term['custom_fields'] = $this->get_term_custom_fields( $_term['term_id'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -856,7 +856,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _prepare_post( $post, $fields ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Holds the data for this post. built up based on $fields.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_post = array( 'post_id' => strval( $post['ID'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_post = array( 'post_id' => (string) $post['ID'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Prepare common post fields.
</span><span class="cx" style="display: block; padding: 0 10px"> $post_fields = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -872,11 +872,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_password' => $post['post_password'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_excerpt' => $post['post_excerpt'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_content' => $post['post_content'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post_parent' => strval( $post['post_parent'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post_parent' => (string) $post['post_parent'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'post_mime_type' => $post['post_mime_type'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => get_permalink( $post['ID'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'guid' => $post['guid'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'menu_order' => intval( $post['menu_order'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'menu_order' => (int) $post['menu_order'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comment_status' => $post['comment_status'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'ping_status' => $post['ping_status'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'sticky' => ( 'post' === $post['post_type'] && is_sticky( $post['ID'] ) ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1009,7 +1009,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _prepare_media_item( $media_item, $thumbnail_size = 'thumbnail' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_media_item = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'attachment_id' => strval( $media_item->ID ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'attachment_id' => (string) $media_item->ID,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'date_created_gmt' => $this->_convert_date_gmt( $media_item->post_date_gmt, $media_item->post_date ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent' => $media_item->post_parent,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => wp_get_attachment_url( $media_item->ID ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,7 +1174,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array The prepared user data.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> protected function _prepare_user( $user, $fields ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_user = array( 'user_id' => strval( $user->ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_user = array( 'user_id' => (string) $user->ID );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $user_fields = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'username' => $user->user_login,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1647,7 +1647,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">- return strval( $post_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (string) $post_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2094,7 +2094,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_term_custom_fields( $term['term_id'], $content_struct['custom_fields'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return strval( $term['term_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (string) $term['term_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5566,7 +5566,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call_success_mw_newPost', $post_ID, $args ); // phpcs:ignore WordPress.NamingConventions.ValidHookName.NotLowercase
</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 strval( $post_ID );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (string) $post_ID;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6555,7 +6555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'xmlrpc_call', 'mt.getPostCategories' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $categories = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $catids = wp_get_post_categories( intval( $post_ID ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $catids = wp_get_post_categories( (int) $post_ID );
</ins><span class="cx" style="display: block; padding: 0 10px"> // First listed category will be the primary category.
</span><span class="cx" style="display: block; padding: 0 10px"> $isPrimary = true;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $catids as $catid ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6812,7 +6812,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = (int) $blah[1];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $urltest['fragment'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // An #anchor is there, it's either...
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $urltest['fragment'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $urltest['fragment'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // ...an integer #XXXX (simplest case),
</span><span class="cx" style="display: block; padding: 0 10px"> $post_ID = (int) $urltest['fragment'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( preg_match( '/post-[0-9]+/', $urltest['fragment'] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/comment-template.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,7 +604,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"> /* translators: Maximum number of words used in a comment excerpt. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_excerpt_length = intval( _x( '20', 'comment_excerpt_length' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_excerpt_length = (int) _x( '20', 'comment_excerpt_length' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the maximum number of words used in the comment excerpt.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2205,7 +2205,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"> // Validation check.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parsed_args['page'] = intval( $parsed_args['page'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parsed_args['page'] = (int) $parsed_args['page'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 0 == $parsed_args['page'] && 0 != $parsed_args['per_page'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parsed_args['page'] = 1;
</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 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/comment.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1254,7 +1254,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $col_length ) && (int) $col_length > 0 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_length = (int) $col_length;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } elseif ( is_array( $col_length ) && isset( $col_length['length'] ) && intval( $col_length['length'] ) > 0 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( is_array( $col_length ) && isset( $col_length['length'] ) && (int) $col_length['length'] > 0 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $max_length = (int) $col_length['length'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $col_length['type'] ) && 'byte' === $col_length['type'] ) {
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizedatetimecontrolphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/customize/class-wp-customize-date-time-control.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,8 +81,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function json() {
</span><span class="cx" style="display: block; padding: 0 10px"> $data = parent::json();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $data['maxYear'] = intval( $this->max_year );
- $data['minYear'] = intval( $this->min_year );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $data['maxYear'] = (int) $this->max_year;
+ $data['minYear'] = (int) $this->min_year;
</ins><span class="cx" style="display: block; padding: 0 10px"> $data['allowPastDate'] = (bool) $this->allow_past_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $data['twelveHourFormat'] = (bool) $this->twelve_hour_format;
</span><span class="cx" style="display: block; padding: 0 10px"> $data['includeTime'] = (bool) $this->include_time;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,7 +245,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_info['description'] = '';
</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">- $formatted_gmt_offset = $this->format_gmt_offset( intval( get_option( 'gmt_offset', 0 ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $formatted_gmt_offset = $this->format_gmt_offset( (int) get_option( 'gmt_offset', 0 ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $timezone_info['description'] = sprintf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: UTC abbreviation and offset, 2: UTC offset. */
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenuitemsettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-item-setting.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +171,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( "Illegal widget setting ID: $id" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->post_id = intval( $matches['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->post_id = (int) $matches['id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_update_nav_menu_item', array( $this, 'flush_cached_value' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $manager, $id, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,7 +368,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_int( $this->value[ $key ] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->value[ $key ] = intval( $this->value[ $key ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->value[ $key ] = (int) $this->value[ $key ];
</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"> foreach ( array( 'classes', 'xfn' ) as $key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -684,11 +684,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value = array_merge( $default, $menu_item_value );
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_value = wp_array_slice_assoc( $menu_item_value, array_keys( $default ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_item_value['position'] = intval( $menu_item_value['position'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_item_value['position'] = (int) $menu_item_value['position'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'object_id', 'menu_item_parent', 'nav_menu_term_id' ) as $key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Note we need to allow negative-integer IDs for previewed objects not inserted yet.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $menu_item_value[ $key ] = intval( $menu_item_value[ $key ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $menu_item_value[ $key ] = (int) $menu_item_value[ $key ];
</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"> foreach ( array( 'type', 'object', 'target' ) as $key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -798,7 +798,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $value['nav_menu_term_id'] ) !== $nav_menu_setting->previous_term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $value['nav_menu_term_id'] !== $nav_menu_setting->previous_term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update_status = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_error = new WP_Error( 'unexpected_previous_term_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,7 +824,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $value['menu_item_parent'] ) !== $parent_nav_menu_item_setting->previous_post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $value['menu_item_parent'] !== $parent_nav_menu_item_setting->previous_post_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->update_status = 'error';
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_error = new WP_Error( 'unexpected_previous_post_id' );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenusectionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-section.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-section.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> public function json() {
</span><span class="cx" style="display: block; padding: 0 10px"> $exported = parent::json();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $exported['menu_id'] = intval( preg_replace( '/^nav_menu\[(-?\d+)\]/', '$1', $this->id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $exported['menu_id'] = (int) preg_replace( '/^nav_menu\[(-?\d+)\]/', '$1', $this->id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $exported;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizenavmenusettingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/customize/class-wp-customize-nav-menu-setting.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,7 +141,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> throw new Exception( "Illegal widget setting ID: $id" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->term_id = intval( $matches['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->term_id = (int) $matches['id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> parent::__construct( $manager, $id, $args );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -433,7 +433,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $value['name'] = trim( esc_html( $value['name'] ) ); // This sanitization code is used in wp-admin/nav-menus.php.
</span><span class="cx" style="display: block; padding: 0 10px"> $value['description'] = sanitize_text_field( $value['description'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $value['parent'] = max( 0, intval( $value['parent'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value['parent'] = max( 0, (int) $value['parent'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $value['auto_add'] = ! empty( $value['auto_add'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' === $value['name'] ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -556,7 +556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_value = $setting->post_value( null );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! is_null( $post_value ) && intval( $post_value ) === $this->previous_term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_null( $post_value ) && (int) $post_value === $this->previous_term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->manager->set_post_value( $setting->id, $this->term_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $setting->save();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -570,7 +570,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $widget_instance = $nav_menu_widget_setting->post_value(); // Note that this calls WP_Customize_Widgets::sanitize_widget_instance().
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( empty( $widget_instance['nav_menu'] ) || intval( $widget_instance['nav_menu'] ) !== $this->previous_term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $widget_instance['nav_menu'] ) || (int) $widget_instance['nav_menu'] !== $this->previous_term_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> continue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/formatting.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/formatting.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/formatting.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3568,8 +3568,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $offset = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sign = ( '+' === substr( $timezone, 0, 1 ) ) ? 1 : -1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $hours = intval( substr( $timezone, 1, 2 ) );
- $minutes = intval( substr( $timezone, 3, 4 ) ) / 60;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $hours = (int) substr( $timezone, 1, 2 );
+ $minutes = (int) substr( $timezone, 3, 4 ) / 60;
</ins><span class="cx" style="display: block; padding: 0 10px"> $offset = $sign * HOUR_IN_SECONDS * ( $hours + $minutes );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $offset;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3820,7 +3820,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $text = str_replace( ']]>', ']]>', $text );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Maximum number of words used in a post excerpt. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $excerpt_length = intval( _x( '55', 'excerpt_length' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $excerpt_length = (int) _x( '55', 'excerpt_length' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the maximum number of words in a post excerpt.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4725,7 +4725,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $value ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $value = 1;
</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">- $value = intval( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $value = (int) $value;
</ins><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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5067,7 +5067,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $_fragment != $fragment ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fragment = $_fragment;
</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">- $fragment = sprintf( $fragment, strval( $arg ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fragment = sprintf( $fragment, (string) $arg );
</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="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/functions.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4735,7 +4735,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int A non-negative integer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function absint( $maybeint ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return abs( intval( $maybeint ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return abs( (int) $maybeint );
</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="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/general-template.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1339,7 +1339,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_archive() && ! empty( $m ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $my_year = substr( $m, 0, 4 );
</span><span class="cx" style="display: block; padding: 0 10px"> $my_month = $wp_locale->get_month( substr( $m, 4, 2 ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $my_day = intval( substr( $m, 6, 2 ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $my_day = (int) substr( $m, 6, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2223,7 +2223,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Let's figure out when we are.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $monthnum ) && ! empty( $year ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thismonth = zeroise( intval( $monthnum ), 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thismonth = zeroise( (int) $monthnum, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $thisyear = (int) $year;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $w ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // We need to get the month from MySQL.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3149,7 +3149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $href = get_term_feed_link( $term->term_id, $term->taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_author() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $author_id = intval( get_query_var( 'author' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $author_id = (int) get_query_var( 'author' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $title = sprintf( $args['authortitle'], get_bloginfo( 'name' ), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $href = get_author_feed_link( $author_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3459,7 +3459,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'true' === get_user_option( 'rich_editing' ) || ! is_user_logged_in() ) { // Default to 'true' for logged out users.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_safari ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && (int) $match[1] >= 534 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_IE ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rich_edit = ( strpos( $_SERVER['HTTP_USER_AGENT'], 'Trident/7.0;' ) !== false );
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_gecko || $is_chrome || $is_edge || ( $is_opera && ! wp_is_mobile() ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4195,7 +4195,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Get max pages and current page out of the current query, if available.
</span><span class="cx" style="display: block; padding: 0 10px"> $total = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $current = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $current = get_query_var( 'paged' ) ? (int) get_query_var( 'paged' ) : 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Append the format placeholder to the base URL.
</span><span class="cx" style="display: block; padding: 0 10px"> $pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
</span></span></pre></div>
<a id="trunksrcwpincludeshttpphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/http.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/http.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/http.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -668,7 +668,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_parse_url( $url, $component = -1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $to_unset = array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = strval( $url );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = (string) $url;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '//' === substr( $url, 0, 2 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $to_unset[] = 'scheme';
</span></span></pre></div>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/link-template.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -515,7 +515,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $monthlink = $wp_rewrite->get_month_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $monthlink ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $monthlink = str_replace( '%year%', $year, $monthlink );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $monthlink = str_replace( '%monthnum%', zeroise( intval( $month ), 2 ), $monthlink );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $monthlink = str_replace( '%monthnum%', zeroise( (int) $month, 2 ), $monthlink );
</ins><span class="cx" style="display: block; padding: 0 10px"> $monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -560,8 +560,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $daylink = $wp_rewrite->get_day_permastruct();
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $daylink ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $daylink = str_replace( '%year%', $year, $daylink );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $daylink = str_replace( '%monthnum%', zeroise( intval( $month ), 2 ), $daylink );
- $daylink = str_replace( '%day%', zeroise( intval( $day ), 2 ), $daylink );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $daylink = str_replace( '%monthnum%', zeroise( (int) $month, 2 ), $daylink );
+ $daylink = str_replace( '%day%', zeroise( (int) $day, 2 ), $daylink );
</ins><span class="cx" style="display: block; padding: 0 10px"> $daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2320,7 +2320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $paged ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $paged = 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">- $nextpage = intval( $paged ) + 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nextpage = (int) $paged + 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $max_page || $max_page >= $nextpage ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return get_pagenum_link( $nextpage );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2369,7 +2369,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $paged = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nextpage = intval( $paged ) + 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nextpage = (int) $paged + 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $label ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $label = __( 'Next Page »' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2418,7 +2418,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $paged;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_single() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nextpage = intval( $paged ) - 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nextpage = (int) $paged - 1;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $nextpage < 1 ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $nextpage = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2891,7 +2891,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $page = 1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $nextpage = intval( $page ) + 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $nextpage = (int) $page + 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $max_page ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_page = $wp_query->max_num_comment_pages;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2946,11 +2946,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $page = get_query_var( 'cpage' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $page ) <= 1 ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $page <= 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prevpage = intval( $page ) - 1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $prevpage = (int) $page - 1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $label ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $label = __( '« Older Comments' );
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/media.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,8 +70,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = $size[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = $size[1];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'thumb' === $size || 'thumbnail' === $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_width = intval( get_option( 'thumbnail_size_w' ) );
- $max_height = intval( get_option( 'thumbnail_size_h' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_width = (int) get_option( 'thumbnail_size_w' );
+ $max_height = (int) get_option( 'thumbnail_size_h' );
</ins><span class="cx" style="display: block; padding: 0 10px"> // Last chance thumbnail size defaults.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $max_width && ! $max_height ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = 128;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -78,15 +78,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $max_height = 96;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'medium' === $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_width = intval( get_option( 'medium_size_w' ) );
- $max_height = intval( get_option( 'medium_size_h' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_width = (int) get_option( 'medium_size_w' );
+ $max_height = (int) get_option( 'medium_size_h' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'medium_large' === $size ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_width = intval( get_option( 'medium_large_size_w' ) );
- $max_height = intval( get_option( 'medium_large_size_h' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_width = (int) get_option( 'medium_large_size_w' );
+ $max_height = (int) get_option( 'medium_large_size_h' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $content_width ) > 0 ) {
- $max_width = min( intval( $content_width ), $max_width );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $content_width > 0 ) {
+ $max_width = min( (int) $content_width, $max_width );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'large' === $size ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -95,18 +95,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * itself, and within the theme's content width if it's known. The user
</span><span class="cx" style="display: block; padding: 0 10px"> * can resize it in the editor if they wish.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_width = intval( get_option( 'large_size_w' ) );
- $max_height = intval( get_option( 'large_size_h' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_width = (int) get_option( 'large_size_w' );
+ $max_height = (int) get_option( 'large_size_h' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $content_width ) > 0 ) {
- $max_width = min( intval( $content_width ), $max_width );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $content_width > 0 ) {
+ $max_width = min( (int) $content_width, $max_width );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $max_width = intval( $_wp_additional_image_sizes[ $size ]['width'] );
- $max_height = intval( $_wp_additional_image_sizes[ $size ]['height'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $max_width = (int) $_wp_additional_image_sizes[ $size ]['width'];
+ $max_height = (int) $_wp_additional_image_sizes[ $size ]['height'];
</ins><span class="cx" style="display: block; padding: 0 10px"> // Only in admin. Assume that theme authors know what they're doing.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $content_width ) > 0 && 'edit' === $context ) {
- $max_width = min( intval( $content_width ), $max_width );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $content_width > 0 && 'edit' === $context ) {
+ $max_width = min( (int) $content_width, $max_width );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else { // $size === 'full' has no constraint.
</span><span class="cx" style="display: block; padding: 0 10px"> $max_width = $width;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -155,10 +155,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function image_hwstring( $width, $height ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $out = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $width ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out .= 'width="' . intval( $width ) . '" ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out .= 'width="' . (int) $width . '" ';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $height ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $out .= 'height="' . intval( $height ) . '" ';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $out .= 'height="' . (int) $height . '" ';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $out;
</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">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $imagedata['sizes'] as $_size => $data ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's an exact match to an existing image size, short circuit.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $data['width'] ) === intval( $size[0] ) && intval( $data['height'] ) === intval( $size[1] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $data['width'] === (int) $size[0] && (int) $data['height'] === (int) $size[1] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $candidates[ $data['width'] * $data['height'] ] = $data;
</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">@@ -896,16 +896,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $additional_sizes[ $size_name ]['width'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // For sizes added by plugins and themes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_data['width'] = intval( $additional_sizes[ $size_name ]['width'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_data['width'] = (int) $additional_sizes[ $size_name ]['width'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // For default sizes set in options.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_data['width'] = intval( get_option( "{$size_name}_size_w" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_data['width'] = (int) get_option( "{$size_name}_size_w" );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $additional_sizes[ $size_name ]['height'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_data['height'] = intval( $additional_sizes[ $size_name ]['height'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_data['height'] = (int) $additional_sizes[ $size_name ]['height'];
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $size_data['height'] = intval( get_option( "{$size_name}_size_h" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $size_data['height'] = (int) get_option( "{$size_name}_size_h" );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $size_data['width'] ) && empty( $size_data['height'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2215,7 +2215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'gallery'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = intval( $atts['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = (int) $atts['id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $atts['include'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_attachments = get_posts(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2293,7 +2293,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $icontag = 'dt';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $columns = intval( $atts['columns'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $columns = (int) $atts['columns'];
</ins><span class="cx" style="display: block; padding: 0 10px"> $itemwidth = $columns > 0 ? floor( 100 / $columns ) : 100;
</span><span class="cx" style="display: block; padding: 0 10px"> $float = is_rtl() ? 'right' : 'left';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2553,7 +2553,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'playlist'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $id = intval( $atts['id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $id = (int) $atts['id'];
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'audio' !== $atts['type'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $atts['type'] = 'video';
</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"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $attachments as $k => $attachment ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $attachment->ID ) === intval( $post->ID ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $attachment->ID === (int) $post->ID ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4516,7 +4516,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Specify the post ID of the gallery we're viewing if the shortcode doesn't reference another post already.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $shortcode_attrs['id'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shortcode[3] .= ' id="' . intval( $post->ID ) . '"';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $shortcode[3] .= ' id="' . (int) $post->ID . '"';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $gallery = do_shortcode_tag( $shortcode );
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/meta.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +722,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">- $meta_id = intval( $meta_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = (int) $meta_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $meta_id <= 0 ) {
</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">@@ -786,7 +786,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">- $meta_id = intval( $meta_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = (int) $meta_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $meta_id <= 0 ) {
</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">@@ -901,7 +901,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">- $meta_id = intval( $meta_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $meta_id = (int) $meta_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $meta_id <= 0 ) {
</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">@@ -1062,7 +1062,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $meta_list ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $meta_list as $metarow ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $mpid = intval( $metarow[ $column ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mpid = (int) $metarow[ $column ];
</ins><span class="cx" style="display: block; padding: 0 10px"> $mkey = $metarow['meta_key'];
</span><span class="cx" style="display: block; padding: 0 10px"> $mval = $metarow['meta_value'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/ms-functions.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> $mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
</span><span class="cx" style="display: block; padding: 0 10px"> $path = $base;
</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">- $mydomain = "$domain";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $mydomain = $domain;
</ins><span class="cx" style="display: block; padding: 0 10px"> $path = $base . $blogname . '/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( domain_exists( $mydomain, $path, $current_network->id ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1970,7 +1970,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $term_id;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = intval( $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
</span></span></pre></div>
<a id="trunksrcwpincludesnavmenuphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/nav-menu.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/nav-menu.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/nav-menu.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -552,8 +552,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $menu_item_db_id = (int) $menu_item_db_id;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_type', sanitize_key( $args['menu-item-type'] ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', strval( (int) $args['menu-item-parent-id'] ) );
- update_post_meta( $menu_item_db_id, '_menu_item_object_id', strval( (int) $args['menu-item-object-id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ update_post_meta( $menu_item_db_id, '_menu_item_menu_item_parent', (string) ( (int) $args['menu-item-parent-id'] ) );
+ update_post_meta( $menu_item_db_id, '_menu_item_object_id', (string) ( (int) $args['menu-item-object-id'] ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_object', sanitize_key( $args['menu-item-object'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> update_post_meta( $menu_item_db_id, '_menu_item_target', sanitize_key( $args['menu-item-target'] ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespluggablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/pluggable.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/pluggable.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/pluggable.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2540,7 +2540,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return abs( intval( $value ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return abs( (int) $value );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/post.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4135,7 +4135,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 ( $thumbnail_support ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $thumbnail_id = intval( $postarr['_thumbnail_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumbnail_id = (int) $postarr['_thumbnail_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( -1 === $thumbnail_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> delete_post_thumbnail( $post_ID );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4593,7 +4593,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Prevent new post slugs that could result in URLs that conflict with date archives.
</span><span class="cx" style="display: block; padding: 0 10px"> $conflicts_with_date_archive = false;
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $slug_num = intval( $slug );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $slug_num = (int) $slug;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $slug_num ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $permastructs = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5266,7 +5266,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Build a hash of ID -> children.
</span><span class="cx" style="display: block; padding: 0 10px"> $children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $pages as $page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $children[ intval( $page->post_parent ) ][] = $page;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $children[ (int) $page->post_parent ][] = $page;
</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"> $page_list = array();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5310,7 +5310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $children = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( (array) $pages as $p ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = intval( $p->post_parent );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $parent_id = (int) $p->post_parent;
</ins><span class="cx" style="display: block; padding: 0 10px"> $children[ $parent_id ][] = $p;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5519,7 +5519,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $post_authors ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_authors as $post_author ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Do we have an author id or an author login?
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 0 == intval( $post_author ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 0 == (int) $post_author ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_author = get_user_by( 'login', $post_author );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_author ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> continue;
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestattachmentscontrollerphp"></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-attachments-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-attachments-controller.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -499,10 +499,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $crop ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $size = $image_editor->get_size();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $crop_x = round( ( $size['width'] * floatval( $request['x'] ) ) / 100.0 );
- $crop_y = round( ( $size['height'] * floatval( $request['y'] ) ) / 100.0 );
- $width = round( ( $size['width'] * floatval( $request['width'] ) ) / 100.0 );
- $height = round( ( $size['height'] * floatval( $request['height'] ) ) / 100.0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $crop_x = round( ( $size['width'] * (float) $request['x'] ) / 100.0 );
+ $crop_y = round( ( $size['height'] * (float) $request['y'] ) / 100.0 );
+ $width = round( ( $size['width'] * (float) $request['width'] ) / 100.0 );
+ $height = round( ( $size['height'] * (float) $request['height'] ) / 100.0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $result = $image_editor->crop( $crop_x, $crop_y, $width, $height );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblockdirectorycontrollerphp"></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-block-directory-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-block-directory-controller.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-directory-controller.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,10 +128,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => wp_trim_words( $plugin['description'], 30, '...' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => $plugin['slug'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating' => $plugin['rating'] / 20,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rating_count' => intval( $plugin['num_ratings'] ),
- 'active_installs' => intval( $plugin['active_installs'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rating_count' => (int) $plugin['num_ratings'],
+ 'active_installs' => (int) $plugin['active_installs'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'author_block_rating' => $plugin['author_block_rating'] / 20,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'author_block_count' => intval( $plugin['author_block_count'] ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'author_block_count' => (int) $plugin['author_block_count'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'author' => wp_strip_all_tags( $plugin['author'] ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'icon' => ( isset( $plugin['icons']['1x'] ) ? $plugin['icons']['1x'] : 'block-default' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'last_updated' => gmdate( 'Y-m-d\TH:i:s', strtotime( $plugin['last_updated'] ) ),
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestblockrenderercontrollerphp"></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-block-renderer-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-block-renderer-controller.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-block-renderer-controller.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> public function get_item_permissions_check( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $request['post_id'] ) ? intval( $request['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $request['post_id'] ) ? (int) $request['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 < $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -149,7 +149,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function get_item( $request ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $post;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = isset( $request['post_id'] ) ? intval( $request['post_id'] ) : 0;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = isset( $request['post_id'] ) ? (int) $request['post_id'] : 0;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 < $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post_id );
</span></span></pre></div>
<a id="trunksrcwpincludesrestapiphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rest-api.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/rest-api.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1320,7 +1320,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if an integer, otherwise false.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function rest_is_integer( $maybe_integer ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return is_numeric( $maybe_integer ) && round( floatval( $maybe_integer ) ) === floatval( $maybe_integer );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return is_numeric( $maybe_integer ) && round( (float) $maybe_integer ) === (float) $maybe_integer;
</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">@@ -2012,7 +2012,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 ( 'string' === $args['type'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return strval( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (string) $value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $value;
</span></span></pre></div>
<a id="trunksrcwpincludesrevisionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/revision.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/revision.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -547,7 +547,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( true === $num ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $num = -1;
</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">- $num = intval( $num );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $num = (int) $num;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,12 +678,12 @@
</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">- $thumbnail_id = intval( $_REQUEST['_thumbnail_id'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $thumbnail_id = (int) $_REQUEST['_thumbnail_id'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $thumbnail_id <= 0 ) {
</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">- return strval( $thumbnail_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (string) $thumbnail_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rewrite.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/rewrite.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,12 +400,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // If the date of the post doesn't match the date specified in the URL, resolve to the date archive.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( preg_match( '/^([0-9]{4})\-([0-9]{2})/', $post->post_date, $matches ) && isset( $query_vars['year'] ) && ( 'monthnum' === $compare || 'day' === $compare ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // $matches[1] is the year the post was published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $query_vars['year'] ) !== intval( $matches[1] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) $query_vars['year'] !== (int) $matches[1] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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="cx" style="display: block; padding: 0 10px"> // $matches[2] is the month the post was published.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && intval( $query_vars['monthnum'] ) !== intval( $matches[2] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'day' === $compare && isset( $query_vars['monthnum'] ) && (int) $query_vars['monthnum'] !== (int) $matches[2] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $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">@@ -437,7 +437,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If we've gotten to this point, we have a slug/date clash. First, adjust for nextpage.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '' !== $maybe_page ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $query_vars['page'] = intval( $maybe_page );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $query_vars['page'] = (int) $maybe_page;
</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"> // Next, unset autodetected date-related query vars.
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/taxonomy.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1048,7 +1048,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = intval( $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $term_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $terms = _get_term_hierarchy( $taxonomy );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3490,9 +3490,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $term_ids = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $_term_ids as $term_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_ids[] = intval( $term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids[] = (int) $term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $term_id->term_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_ids[] = intval( $term_id->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_ids[] = (int) $term_id->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3948,12 +3948,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $term_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $shared_term = $term_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = intval( $shared_term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $shared_term->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_object( $term_taxonomy_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term_taxonomy = $term_taxonomy_id;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_taxonomy_id = intval( $term_taxonomy->term_taxonomy_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_taxonomy_id = (int) $term_taxonomy->term_taxonomy_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there are no shared term_taxonomy rows, there's nothing to do here.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4120,7 +4120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Rekey shared term array for faster lookups.
</span><span class="cx" style="display: block; padding: 0 10px"> $_shared_terms = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $shared_terms as $shared_term ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = intval( $shared_term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $shared_term->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> $_shared_terms[ $term_id ] = $shared_term;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $shared_terms = $_shared_terms;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4134,7 +4134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $skipped_first_term = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $taxonomies = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $shared_tts as $shared_tt ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id = intval( $shared_tt->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $shared_tt->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Don't split the first tt belonging to a given term_id.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $skipped_first_term[ $term_id ] ) ) {
</span></span></pre></div>
<a id="trunksrcwpincludesupdatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/update.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/update.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/update.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -322,7 +322,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $plugins as $file => $p ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $new_option->checked[ $file ] = $p['Version'];
</span><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( $current->checked[ $file ] ) || strval( $current->checked[ $file ] ) !== strval( $p['Version'] ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $current->checked[ $file ] ) || (string) $current->checked[ $file ] !== (string) $p['Version'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $plugin_changed = 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">@@ -527,7 +527,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_changed = false;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $checked as $slug => $v ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! isset( $last_update->checked[ $slug ] ) || strval( $last_update->checked[ $slug ] ) !== strval( $v ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $last_update->checked[ $slug ] ) || (string) $last_update->checked[ $slug ] !== (string) $v ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme_changed = 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="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 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/vars.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,7 +134,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global bool $is_iis7
</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_iis7 = $is_IIS && intval( substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) ) >= 7;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$is_iis7 = $is_IIS && (int) substr( $_SERVER['SERVER_SOFTWARE'], strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS/' ) + 14 ) >= 7;
</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"> * Test if the current browser runs on a mobile device (smart phone, tablet, etc.)
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetlinksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/widgets/class-wp-widget-links.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-links.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/widgets/class-wp-widget-links.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,8 +109,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $instance['orderby'] = $new_instance['orderby'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $instance['category'] = intval( $new_instance['category'] );
- $instance['limit'] = ! empty( $new_instance['limit'] ) ? intval( $new_instance['limit'] ) : -1;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $instance['category'] = (int) $new_instance['category'];
+ $instance['limit'] = ! empty( $new_instance['limit'] ) ? (int) $new_instance['limit'] : -1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $instance;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $link_cats = get_terms( array( 'taxonomy' => 'link_category' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $limit = intval( $instance['limit'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $limit = (int) $instance['limit'];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $limit ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $limit = -1;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -148,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <select class="widefat" id="<?php echo $this->get_field_id( 'category' ); ?>" name="<?php echo $this->get_field_name( 'category' ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <option value=""><?php _ex( 'All Links', 'links widget' ); ?></option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php foreach ( $link_cats as $link_cat ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <option value="<?php echo intval( $link_cat->term_id ); ?>" <?php selected( $instance['category'], $link_cat->term_id ); ?>>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <option value="<?php echo (int) $link_cat->term_id; ?>" <?php selected( $instance['category'], $link_cat->term_id ); ?>>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php echo esc_html( $link_cat->name ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </option>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endforeach; ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,7 +181,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <label for="<?php echo $this->get_field_id( 'limit' ); ?>"><?php _e( 'Number of links to show:' ); ?></label>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="text" value="<?php echo ( -1 !== $limit ) ? intval( $limit ) : ''; ?>" size="3" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="<?php echo $this->get_field_id( 'limit' ); ?>" name="<?php echo $this->get_field_name( 'limit' ); ?>" type="text" value="<?php echo ( -1 !== $limit ) ? (int) $limit : ''; ?>" size="3" />
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaphp"></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-media.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-media.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> class="media-widget-instance-property"
</span><span class="cx" style="display: block; padding: 0 10px"> name="<?php echo esc_attr( $this->get_field_name( $name ) ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> id="<?php echo esc_attr( $this->get_field_id( $name ) ); // Needed specifically by wpWidgets.appendTitle(). ?>"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- value="<?php echo esc_attr( is_array( $value ) ? join( ',', $value ) : strval( $value ) ); ?>"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ value="<?php echo esc_attr( is_array( $value ) ? join( ',', $value ) : (string) $value ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> />
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> endforeach;
</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 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/src/wp-trackback.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $_GET['tb_id'] ) || ! $_GET['tb_id'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $tb_id = explode( '/', $_SERVER['REQUEST_URI'] );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $tb_id = intval( $tb_id[ count( $tb_id ) - 1 ] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tb_id = (int) $tb_id[ count( $tb_id ) - 1 ];
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $tb_url = isset( $_POST['url'] ) ? $_POST['url'] : '';
</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"> $tb_id = $posts[0]->ID;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( ! isset( $tb_id ) || ! intval( $tb_id ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! isset( $tb_id ) || ! (int) $tb_id ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> trackback_response( 1, __( 'I really need an ID for this to work.' ) );
</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="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/includes/utils.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +299,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function dmp( ...$args ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $args as $thing ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo ( is_scalar( $thing ) ? strval( $thing ) : var_export( $thing, true ) ), "\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ echo ( is_scalar( $thing ) ? (string) $thing : var_export( $thing, true ) ), "\n";
</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">@@ -319,7 +319,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $out = array();
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $array as $k => $v ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_numeric( $k ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $index = strval( $k );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index = (string) $k;
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $index = "'" . addcslashes( $k, "\n\r\t'\\" ) . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscommentsubmissionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/comment-submission.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/comment-submission.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/comment-submission.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -250,7 +250,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->display_name, $comment->comment_author );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->user_email, $comment->comment_author_email );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $user->user_url, $comment->comment_author_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $user->ID, intval( $comment->user_id ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $user->ID, (int) $comment->user_id );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/customize/manager.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2767,7 +2767,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return int Value.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function sanitize_foo_for_test_set_post_value( $value ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return intval( $value );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return (int) $value;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -173,8 +173,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $post_id ),
- 'url' => get_permalink( intval( $post_id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $post_id,
+ 'url' => get_permalink( (int) $post_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Offset the query and get the second page of menu items.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -205,8 +205,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Page',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'page',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $page_id ),
- 'url' => get_permalink( intval( $page_id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $page_id,
+ 'url' => get_permalink( (int) $page_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = $menus->load_available_items_query( 'post_type', 'page', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,8 +231,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Post',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $post_id ),
- 'url' => get_permalink( intval( $post_id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $post_id,
+ 'url' => get_permalink( (int) $post_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $items = $menus->load_available_items_query( 'post_type', 'post', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,8 +257,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Category',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'category',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $term_id ),
- 'url' => get_term_link( intval( $term_id ), 'category' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $term_id,
+ 'url' => get_term_link( (int) $term_id, 'category' ),
</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"> $items = $menus->load_available_items_query( 'taxonomy', 'category', 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,8 +327,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'post_type',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_post_type_object( 'post' )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $post_id ),
- 'url' => get_permalink( intval( $post_id ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $post_id,
+ 'url' => get_permalink( (int) $post_id ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post_id, $term_ids, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> $search = $post_id === $post_ids[0] ? 'test & search' : 'other title';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -351,8 +351,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => get_taxonomy( 'category' )->labels->singular_name,
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'category',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $term_id ),
- 'url' => get_term_link( intval( $term_id ), 'category' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $term_id,
+ 'url' => get_term_link( (int) $term_id, 'category' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $s = sanitize_text_field( wp_unslash( $term->name ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $menus->search_available_items_query(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -431,8 +431,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'type' => 'taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'type_label' => 'Tests Taxonomy',
</span><span class="cx" style="display: block; padding: 0 10px"> 'object' => 'wptests_tax',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'object_id' => intval( $term_id ),
- 'url' => get_term_link( intval( $term_id ), '' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'object_id' => (int) $term_id,
+ 'url' => get_term_link( (int) $term_id, '' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $results = $menus->search_available_items_query(
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizepartialphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/partial.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/partial.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/customize/partial.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,7 +66,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function render_post_content_partial( $partial ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $id_data = $partial->id_data();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_id = intval( $id_data['keys'][0] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $id_data['keys'][0];
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $post_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/widgets.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/customize/widgets.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -482,7 +482,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'id_base' => 'search',
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget-width' => '250',
</span><span class="cx" style="display: block; padding: 0 10px"> 'widget-height' => '200',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'widget_number' => strval( $widget_number ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'widget_number' => (string) $widget_number,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'multi_number' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> 'add_new' => '',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditorImagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/editorImagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editorImagick.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/image/editorImagick.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,7 +555,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = wp_read_image_metadata( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The orientation value 3 is equivalent to rotated upside down (180 degrees).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 3, intval( $data['orientation'] ), 'Orientation value read from does not match image file Exif data: ' . $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 3, (int) $data['orientation'], 'Orientation value read from does not match image file Exif data: ' . $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $temp_file = wp_tempnam( $file );
</span><span class="cx" style="display: block; padding: 0 10px"> $image = wp_get_image_editor( $file );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -567,7 +567,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $data = wp_read_image_metadata( $ret['path'] );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Make sure the image is no longer in The Upside Down Exif orientation.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( 1, intval( $data['orientation'] ), 'Orientation Exif data was not updated after rotating image: ' . $file );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( 1, (int) $data['orientation'], 'Orientation Exif data was not updated after rotating image: ' . $file );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Remove both the generated file ending in .tmp and tmp.jpg due to wp_tempnam().
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $temp_file );
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionmultisitephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/option/multisite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/multisite.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/option/multisite.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -120,7 +120,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( add_blog_option( $blog_id, $key, $value ) );
</span><span class="cx" style="display: block; padding: 0 10px"> // Assert all values of $blog_id that means the current or main blog (the same here).
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( $value, get_blog_option( $blog_id, $key ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $value, get_blog_option( "$blog_id", $key ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $value, get_blog_option( (string) $blog_id, $key ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> // $this->assertSame( $value, get_option( $key ) ); // Check get_option().
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( add_blog_option( $blog_id, $key, $value ) ); // Already exists.
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/post.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,7 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Helper function: return the timestamp(s) of cron jobs for the specified hook and post.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _next_schedule_for_post( $hook, $id ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return wp_next_scheduled( 'publish_future_post', array( 0 => intval( $id ) ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return wp_next_scheduled( 'publish_future_post', array( 0 => (int) $id ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestpostscontrollerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/rest-api/rest-posts-controller.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -483,7 +483,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( in_array( $id1, $ids, true ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertFalse( in_array( $id2, $ids, 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">- $request->set_param( 'exclude', "$id2" );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request->set_param( 'exclude', (string) $id2 );
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = rest_get_server()->dispatch( $request );
</span><span class="cx" style="display: block; padding: 0 10px"> $data = $response->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $ids = wp_list_pluck( $data, 'id' );
</span></span></pre></div>
<a id="trunktestsphpunitteststermgetTermLinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/getTermLink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/getTermLink.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/term/getTermLink.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,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">- $term = intval( $t1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = (int) $t1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $actual = get_term_link( $term, 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertContains( 'wptests_tax=foo', $actual );
</span></span></pre></div>
<a id="trunktestsphpunitteststermtermExistsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/termExists.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/termExists.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/term/termExists.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,7 +15,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = term_exists( intval( $t ), 'post_tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = term_exists( (int) $t, 'post_tag' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -30,7 +30,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">- $this->assertNull( term_exists( intval( $t ), 'foo' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertNull( term_exists( (int) $t, 'foo' ) );
</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"> public function test_term_exists_term_int_taxonomy_empty_term_exists() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,7 +40,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $found = term_exists( intval( $t ), 'post_tag' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $found = term_exists( (int) $t, 'post_tag' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $t, $found['term_id'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpDeleteTermphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpDeleteTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/term/wpDeleteTerm.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,7 +29,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $terms[0], 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $this->deleted_term->count );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( $this->object_ids, array( "$post_id" ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( $this->object_ids, array( (string) $post_id ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_delete_term( $terms[1], 'wptests_tax' );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 0, $this->deleted_term->count );
</span></span></pre></div>
<a id="trunktestsphpunitteststermwpSetObjectTermsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/term/wpSetObjectTerms.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/term/wpSetObjectTerms.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -145,7 +145,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Remember which term has which term_id.
</span><span class="cx" style="display: block; padding: 0 10px"> for ( $i = 0; $i < 3; $i++ ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $term = get_term_by( 'name', $terms[ $i ], $this->taxonomy );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $term_id[ $terms[ $i ] ] = intval( $term->term_id );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id[ $terms[ $i ] ] = (int) $term->term_id;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsuserwpGetUsersWithNoRolephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/user/wpGetUsersWithNoRole.php 2020-10-08 21:13:57 UTC (rev 49108)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,7 +83,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $users = wp_get_users_with_no_role();
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$nobody}",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (string) $nobody,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $users
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,7 +99,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $users = wp_get_users_with_no_role( $blog_1 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "{$admin}",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ (string) $admin,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $users
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunittestsxmlrpcwpgetPostsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2020-10-08 18:27:07 UTC (rev 49107)
+++ trunk/tests/phpunit/tests/xmlrpc/wp/getPosts.php 2020-10-08 21:13:57 UTC (rev 49108)
</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"> $this->assertNotIXRError( $results2 );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_comment_count = 100;
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $results2 as $post ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $comment_count = intval( get_comments_number( $post['post_id'] ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_count = (int) get_comments_number( $post['post_id'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertLessThanOrEqual( $last_comment_count, $comment_count );
</span><span class="cx" style="display: block; padding: 0 10px"> $last_comment_count = $comment_count;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>